~bzr-pqm/bzr/bzr.dev

4634.170.1 by John Arbash Meinel
Fix bug #437003. Autopacking should not fail for an
1
# Copyright (C) 2008-2011 Canonical Ltd
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
2
#
0.17.9 by Robert Collins
Initial stab at repository format support.
3
# This program is free software; you can redistribute it and/or modify
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
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
#
0.17.9 by Robert Collins
Initial stab at repository format support.
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.
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
12
#
0.17.9 by Robert Collins
Initial stab at repository format support.
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
3735.36.3 by John Arbash Meinel
Add the new address for FSF to the new files.
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0.17.9 by Robert Collins
Initial stab at repository format support.
16
4277.2.1 by Vincent Ladeuil
Fix misleading signature and one typo.
17
"""Repository formats using CHK inventories and groupcompress compression."""
0.17.9 by Robert Collins
Initial stab at repository format support.
18
6379.6.1 by Jelmer Vernooij
Import absolute_import in a few places.
19
from __future__ import absolute_import
20
0.17.9 by Robert Collins
Initial stab at repository format support.
21
import time
22
0.20.19 by John Arbash Meinel
Groupcompress now supports 'autopack' and 'pack'.
23
from bzrlib import (
6472.2.1 by Jelmer Vernooij
Use bzrdir.controldir for generic access to control directories.
24
    controldir,
3735.31.3 by John Arbash Meinel
Rename gc_repo to groupcompress_repo, start trying to remove some of the special casing and get tests passing.
25
    chk_map,
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
26
    chk_serializer,
0.20.19 by John Arbash Meinel
Groupcompress now supports 'autopack' and 'pack'.
27
    debug,
28
    errors,
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
29
    index as _mod_index,
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
30
    inventory,
31
    osutils,
5757.1.3 by Jelmer Vernooij
Revert noknit branch for the moment.
32
    pack,
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
33
    revision as _mod_revision,
0.23.28 by John Arbash Meinel
Gotta import 'trace' if you want to use trace.mutter()
34
    trace,
0.20.19 by John Arbash Meinel
Groupcompress now supports 'autopack' and 'pack'.
35
    ui,
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
36
    versionedfile,
0.20.19 by John Arbash Meinel
Groupcompress now supports 'autopack' and 'pack'.
37
    )
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
38
from bzrlib.btree_index import (
39
    BTreeGraphIndex,
40
    BTreeBuilder,
41
    )
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
42
from bzrlib.decorators import needs_write_lock
3735.31.1 by John Arbash Meinel
Bring the groupcompress plugin into the brisbane-core branch.
43
from bzrlib.groupcompress import (
0.17.9 by Robert Collins
Initial stab at repository format support.
44
    _GCGraphIndex,
45
    GroupCompressVersionedFiles,
46
    )
47
from bzrlib.repofmt.pack_repo import (
5757.5.1 by Jelmer Vernooij
Move _DirectPackAccess to bzrlib.repofmt.pack_repo.
48
    _DirectPackAccess,
0.17.9 by Robert Collins
Initial stab at repository format support.
49
    Pack,
50
    NewPack,
5757.2.1 by Jelmer Vernooij
Don't have CHK stream source depend on knit pack stream source.
51
    PackRepository,
3735.31.9 by John Arbash Meinel
Setting the _commit_builder_class makes commit with rich_root_data=True work.
52
    PackRootCommitBuilder,
0.17.9 by Robert Collins
Initial stab at repository format support.
53
    RepositoryPackCollection,
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
54
    RepositoryFormatPack,
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
55
    ResumedPack,
0.17.9 by Robert Collins
Initial stab at repository format support.
56
    Packer,
0.17.25 by Robert Collins
Preliminary --gc-plain-chk support.
57
    )
5815.4.1 by Jelmer Vernooij
Split versionedfile-specific stuff out into VersionedFileRepository.
58
from bzrlib.vf_repository import (
5757.2.1 by Jelmer Vernooij
Don't have CHK stream source depend on knit pack stream source.
59
    StreamSource,
60
    )
4679.9.4 by John Arbash Meinel
A bit broken, but getting there.
61
from bzrlib.static_tuple import StaticTuple
0.17.9 by Robert Collins
Initial stab at repository format support.
62
63
64
class GCPack(NewPack):
65
0.17.22 by Robert Collins
really get gc working with 1.10
66
    def __init__(self, pack_collection, upload_suffix='', file_mode=None):
0.17.9 by Robert Collins
Initial stab at repository format support.
67
        """Create a NewPack instance.
68
0.20.30 by Ian Clatworthy
repofmt.py code cleanups
69
        :param pack_collection: A PackCollection into which this is being
70
            inserted.
0.17.9 by Robert Collins
Initial stab at repository format support.
71
        :param upload_suffix: An optional suffix to be given to any temporary
72
            files created during the pack creation. e.g '.autopack'
73
        :param file_mode: An optional file mode to create the new files with.
74
        """
3735.31.5 by John Arbash Meinel
Move some of the monkey patching into the correct locations.
75
        # replaced from NewPack to:
0.17.25 by Robert Collins
Preliminary --gc-plain-chk support.
76
        # - change inventory reference list length to 1
77
        # - change texts reference lists to 1
3735.31.5 by John Arbash Meinel
Move some of the monkey patching into the correct locations.
78
        # TODO: patch this to be parameterised
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
79
0.17.9 by Robert Collins
Initial stab at repository format support.
80
        # The relative locations of the packs are constrained, but all are
81
        # passed in because the caller has them, so as to avoid object churn.
0.17.22 by Robert Collins
really get gc working with 1.10
82
        index_builder_class = pack_collection._index_builder_class
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
83
        # from brisbane-core
84
        if pack_collection.chk_index is not None:
85
            chk_index = index_builder_class(reference_lists=0)
0.17.25 by Robert Collins
Preliminary --gc-plain-chk support.
86
        else:
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
87
            chk_index = None
88
        Pack.__init__(self,
89
            # Revisions: parents list, no text compression.
90
            index_builder_class(reference_lists=1),
91
            # Inventory: We want to map compression only, but currently the
92
            # knit code hasn't been updated enough to understand that, so we
93
            # have a regular 2-list index giving parents and compression
94
            # source.
95
            index_builder_class(reference_lists=1),
4371.2.2 by Vincent Ladeuil
Fix comment as per John's review.
96
            # Texts: per file graph, for all fileids - so one reference list
97
            # and two elements in the key tuple.
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
98
            index_builder_class(reference_lists=1, key_elements=2),
99
            # Signatures: Just blobs to store, no compression, no parents
100
            # listing.
101
            index_builder_class(reference_lists=0),
102
            # CHK based storage - just blobs, no compression or parents.
103
            chk_index=chk_index
104
            )
0.17.22 by Robert Collins
really get gc working with 1.10
105
        self._pack_collection = pack_collection
106
        # When we make readonly indices, we need this.
107
        self.index_class = pack_collection._index_class
0.17.9 by Robert Collins
Initial stab at repository format support.
108
        # where should the new pack be opened
0.17.22 by Robert Collins
really get gc working with 1.10
109
        self.upload_transport = pack_collection._upload_transport
0.17.9 by Robert Collins
Initial stab at repository format support.
110
        # where are indices written out to
0.17.22 by Robert Collins
really get gc working with 1.10
111
        self.index_transport = pack_collection._index_transport
0.17.9 by Robert Collins
Initial stab at repository format support.
112
        # where is the pack renamed to when it is finished?
0.17.22 by Robert Collins
really get gc working with 1.10
113
        self.pack_transport = pack_collection._pack_transport
0.17.9 by Robert Collins
Initial stab at repository format support.
114
        # What file mode to upload the pack and indices with.
115
        self._file_mode = file_mode
116
        # tracks the content written to the .pack file.
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
117
        self._hash = osutils.md5()
0.17.9 by Robert Collins
Initial stab at repository format support.
118
        # a four-tuple with the length in bytes of the indices, once the pack
119
        # is finalised. (rev, inv, text, sigs)
120
        self.index_sizes = None
121
        # How much data to cache when writing packs. Note that this is not
122
        # synchronised with reads, because it's not in the transport layer, so
123
        # is not safe unless the client knows it won't be reading from the pack
124
        # under creation.
125
        self._cache_limit = 0
126
        # the temporary pack file name.
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
127
        self.random_name = osutils.rand_chars(20) + upload_suffix
0.17.9 by Robert Collins
Initial stab at repository format support.
128
        # when was this pack started ?
129
        self.start_time = time.time()
130
        # open an output stream for the data added to the pack.
131
        self.write_stream = self.upload_transport.open_write_stream(
132
            self.random_name, mode=self._file_mode)
133
        if 'pack' in debug.debug_flags:
0.23.30 by John Arbash Meinel
Merge in Ian's groupcompress trunk updates
134
            trace.mutter('%s: create_pack: pack stream open: %s%s t+%6.3fs',
0.17.9 by Robert Collins
Initial stab at repository format support.
135
                time.ctime(), self.upload_transport.base, self.random_name,
136
                time.time() - self.start_time)
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
137
        # A list of byte sequences to be written to the new pack, and the
138
        # aggregate size of them.  Stored as a list rather than separate
0.17.9 by Robert Collins
Initial stab at repository format support.
139
        # variables so that the _write_data closure below can update them.
140
        self._buffer = [[], 0]
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
141
        # create a callable for adding data
0.17.9 by Robert Collins
Initial stab at repository format support.
142
        #
143
        # robertc says- this is a closure rather than a method on the object
144
        # so that the variables are locals, and faster than accessing object
145
        # members.
146
        def _write_data(bytes, flush=False, _buffer=self._buffer,
147
            _write=self.write_stream.write, _update=self._hash.update):
148
            _buffer[0].append(bytes)
149
            _buffer[1] += len(bytes)
150
            # buffer cap
151
            if _buffer[1] > self._cache_limit or flush:
152
                bytes = ''.join(_buffer[0])
153
                _write(bytes)
154
                _update(bytes)
155
                _buffer[:] = [[], 0]
156
        # expose this on self, for the occasion when clients want to add data.
157
        self._write_data = _write_data
158
        # a pack writer object to serialise pack records.
5757.1.3 by Jelmer Vernooij
Revert noknit branch for the moment.
159
        self._writer = pack.ContainerWriter(self._write_data)
0.17.9 by Robert Collins
Initial stab at repository format support.
160
        self._writer.begin()
161
        # what state is the pack in? (open, finished, aborted)
162
        self._state = 'open'
4476.3.31 by Andrew Bennetts
Fix 'pack already exists' test failure by checking if the pack name already exists when packing a single GC pack.
163
        # no name until we finish writing the content
164
        self.name = None
0.17.9 by Robert Collins
Initial stab at repository format support.
165
3735.31.17 by John Arbash Meinel
Properly support suspend/resume by disallowing them :).
166
    def _check_references(self):
167
        """Make sure our external references are present.
168
169
        Packs are allowed to have deltas whose base is not in the pack, but it
170
        must be present somewhere in this collection.  It is not allowed to
171
        have deltas based on a fallback repository.
172
        (See <https://bugs.launchpad.net/bzr/+bug/288751>)
173
        """
4343.3.1 by John Arbash Meinel
Set 'supports_external_lookups=True' for dev6 repositories.
174
        # Groupcompress packs don't have any external references, arguably CHK
175
        # pages have external references, but we cannot 'cheaply' determine
176
        # them without actually walking all of the chk pages.
3735.31.17 by John Arbash Meinel
Properly support suspend/resume by disallowing them :).
177
0.17.9 by Robert Collins
Initial stab at repository format support.
178
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
179
class ResumedGCPack(ResumedPack):
180
4343.3.8 by John Arbash Meinel
Some cleanup passes.
181
    def _check_references(self):
182
        """Make sure our external compression parents are present."""
183
        # See GCPack._check_references for why this is empty
184
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
185
    def _get_external_refs(self, index):
186
        # GC repositories don't have compression parents external to a given
187
        # pack file
188
        return set()
189
190
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
191
class GCCHKPacker(Packer):
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
192
    """This class understand what it takes to collect a GCCHK repo."""
0.17.9 by Robert Collins
Initial stab at repository format support.
193
3735.31.24 by John Arbash Meinel
Start moving more things deeper inside the code.
194
    def __init__(self, pack_collection, packs, suffix, revision_ids=None,
195
                 reload_func=None):
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
196
        super(GCCHKPacker, self).__init__(pack_collection, packs, suffix,
197
                                          revision_ids=revision_ids,
198
                                          reload_func=reload_func)
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
199
        self._pack_collection = pack_collection
200
        # ATM, We only support this for GCCHK repositories
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
201
        if pack_collection.chk_index is None:
202
            raise AssertionError('pack_collection.chk_index should not be None')
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
203
        self._gather_text_refs = False
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
204
        self._chk_id_roots = []
205
        self._chk_p_id_roots = []
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
206
        self._text_refs = None
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
207
        # set by .pack() if self.revision_ids is not None
208
        self.revision_keys = None
0.17.9 by Robert Collins
Initial stab at repository format support.
209
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
210
    def _get_progress_stream(self, source_vf, keys, message, pb):
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
211
        def pb_stream():
212
            substream = source_vf.get_record_stream(keys, 'groupcompress', True)
213
            for idx, record in enumerate(substream):
214
                if pb is not None:
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
215
                    pb.update(message, idx + 1, len(keys))
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
216
                yield record
217
        return pb_stream()
218
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
219
    def _get_filtered_inv_stream(self, source_vf, keys, message, pb=None):
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
220
        """Filter the texts of inventories, to find the chk pages."""
0.17.43 by John Arbash Meinel
Give better chk and inventory progress indication during pack/autopack
221
        total_keys = len(keys)
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
222
        def _filtered_inv_stream():
223
            id_roots_set = set()
224
            p_id_roots_set = set()
225
            stream = source_vf.get_record_stream(keys, 'groupcompress', True)
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
226
            for idx, record in enumerate(stream):
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
227
                # Inventories should always be with revisions; assume success.
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
228
                bytes = record.get_bytes_as('fulltext')
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
229
                chk_inv = inventory.CHKInventory.deserialise(None, bytes,
230
                                                             record.key)
0.17.43 by John Arbash Meinel
Give better chk and inventory progress indication during pack/autopack
231
                if pb is not None:
232
                    pb.update('inv', idx, total_keys)
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
233
                key = chk_inv.id_to_entry.key()
234
                if key not in id_roots_set:
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
235
                    self._chk_id_roots.append(key)
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
236
                    id_roots_set.add(key)
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
237
                p_id_map = chk_inv.parent_id_basename_to_file_id
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
238
                if p_id_map is None:
239
                    raise AssertionError('Parent id -> file_id map not set')
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
240
                key = p_id_map.key()
241
                if key not in p_id_roots_set:
242
                    p_id_roots_set.add(key)
243
                    self._chk_p_id_roots.append(key)
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
244
                yield record
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
245
            # We have finished processing all of the inventory records, we
246
            # don't need these sets anymore
247
            id_roots_set.clear()
248
            p_id_roots_set.clear()
3735.42.3 by John Arbash Meinel
Fix a bug introduced into GCPacker.
249
        return _filtered_inv_stream()
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
250
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
251
    def _get_chk_streams(self, source_vf, keys, pb=None):
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
252
        # We want to stream the keys from 'id_roots', and things they
253
        # reference, and then stream things from p_id_roots and things they
254
        # reference, and then any remaining keys that we didn't get to.
255
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
256
        # We also group referenced texts together, so if one root references a
257
        # text with prefix 'a', and another root references a node with prefix
258
        # 'a', we want to yield those nodes before we yield the nodes for 'b'
0.20.30 by Ian Clatworthy
repofmt.py code cleanups
259
        # This keeps 'similar' nodes together.
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
260
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
261
        # Note: We probably actually want multiple streams here, to help the
262
        #       client understand that the different levels won't compress well
0.20.30 by Ian Clatworthy
repofmt.py code cleanups
263
        #       against each other.
0.20.27 by John Arbash Meinel
Update a Note/Todo
264
        #       Test the difference between using one Group per level, and
265
        #       using 1 Group per prefix. (so '' (root) would get a group, then
266
        #       all the references to search-key 'a' would get a group, etc.)
0.17.43 by John Arbash Meinel
Give better chk and inventory progress indication during pack/autopack
267
        total_keys = len(keys)
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
268
        remaining_keys = set(keys)
0.20.25 by John Arbash Meinel
As expected, splitting things up into streams of streams
269
        counter = [0]
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
270
        if self._gather_text_refs:
271
            self._text_refs = set()
272
        def _get_referenced_stream(root_keys, parse_leaf_nodes=False):
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
273
            cur_keys = root_keys
274
            while cur_keys:
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
275
                keys_by_search_prefix = {}
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
276
                remaining_keys.difference_update(cur_keys)
277
                next_keys = set()
3735.31.26 by John Arbash Meinel
A bit more internal refactoring.
278
                def handle_internal_node(node):
279
                    for prefix, value in node._items.iteritems():
3735.2.147 by John Arbash Meinel
Track down and fix an unexpected edge case.
280
                        # We don't want to request the same key twice, and we
281
                        # want to order it by the first time it is seen.
282
                        # Even further, we don't want to request a key which is
283
                        # not in this group of pack files (it should be in the
284
                        # repo, but it doesn't have to be in the group being
285
                        # packed.)
286
                        # TODO: consider how to treat externally referenced chk
287
                        #       pages as 'external_references' so that we
288
                        #       always fill them in for stacked branches
289
                        if value not in next_keys and value in remaining_keys:
3735.31.26 by John Arbash Meinel
A bit more internal refactoring.
290
                            keys_by_search_prefix.setdefault(prefix,
291
                                []).append(value)
292
                            next_keys.add(value)
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
293
                def handle_leaf_node(node):
294
                    # Store is None, because we know we have a LeafNode, and we
295
                    # just want its entries
296
                    for file_id, bytes in node.iteritems(None):
5218.2.1 by John Arbash Meinel
Implement a compiled extension for parsing the text key out of a CHKInventory value.
297
                        self._text_refs.add(chk_map._bytes_to_text_key(bytes))
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
298
                def next_stream():
3735.2.147 by John Arbash Meinel
Track down and fix an unexpected edge case.
299
                    stream = source_vf.get_record_stream(cur_keys,
300
                                                         'as-requested', True)
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
301
                    for record in stream:
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
302
                        if record.storage_kind == 'absent':
303
                            # An absent CHK record: we assume that the missing
304
                            # record is in a different pack - e.g. a page not
305
                            # altered by the commit we're packing.
306
                            continue
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
307
                        bytes = record.get_bytes_as('fulltext')
308
                        # We don't care about search_key_func for this code,
309
                        # because we only care about external references.
310
                        node = chk_map._deserialise(bytes, record.key,
311
                                                    search_key_func=None)
312
                        common_base = node._search_prefix
313
                        if isinstance(node, chk_map.InternalNode):
3735.31.26 by John Arbash Meinel
A bit more internal refactoring.
314
                            handle_internal_node(node)
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
315
                        elif parse_leaf_nodes:
316
                            handle_leaf_node(node)
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
317
                        counter[0] += 1
318
                        if pb is not None:
0.17.43 by John Arbash Meinel
Give better chk and inventory progress indication during pack/autopack
319
                            pb.update('chk node', counter[0], total_keys)
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
320
                        yield record
321
                yield next_stream()
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
322
                # Double check that we won't be emitting any keys twice
3735.31.26 by John Arbash Meinel
A bit more internal refactoring.
323
                # If we get rid of the pre-calculation of all keys, we could
324
                # turn this around and do
325
                # next_keys.difference_update(seen_keys)
3735.2.147 by John Arbash Meinel
Track down and fix an unexpected edge case.
326
                # However, we also may have references to chk pages in another
327
                # pack file during autopack. We filter earlier, so we should no
328
                # longer need to do this
329
                # next_keys = next_keys.intersection(remaining_keys)
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
330
                cur_keys = []
331
                for prefix in sorted(keys_by_search_prefix):
3735.34.1 by John Arbash Meinel
Some testing to see if we can decrease the peak memory consumption a bit.
332
                    cur_keys.extend(keys_by_search_prefix.pop(prefix))
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
333
        for stream in _get_referenced_stream(self._chk_id_roots,
334
                                             self._gather_text_refs):
0.20.26 by John Arbash Meinel
Try even harder, now with even *more* streams.
335
            yield stream
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
336
        del self._chk_id_roots
3735.2.147 by John Arbash Meinel
Track down and fix an unexpected edge case.
337
        # while it isn't really possible for chk_id_roots to not be in the
338
        # local group of packs, it is possible that the tree shape has not
339
        # changed recently, so we need to filter _chk_p_id_roots by the
340
        # available keys
341
        chk_p_id_roots = [key for key in self._chk_p_id_roots
342
                          if key in remaining_keys]
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
343
        del self._chk_p_id_roots
3735.2.147 by John Arbash Meinel
Track down and fix an unexpected edge case.
344
        for stream in _get_referenced_stream(chk_p_id_roots, False):
345
            yield stream
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
346
        if remaining_keys:
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
347
            trace.mutter('There were %d keys in the chk index, %d of which'
348
                         ' were not referenced', total_keys,
349
                         len(remaining_keys))
350
            if self.revision_ids is None:
351
                stream = source_vf.get_record_stream(remaining_keys,
352
                                                     'unordered', True)
353
                yield stream
0.22.5 by John Arbash Meinel
Try a different method of streaming the chk pages.
354
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
355
    def _build_vf(self, index_name, parents, delta, for_write=False):
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
356
        """Build a VersionedFiles instance on top of this group of packs."""
357
        index_name = index_name + '_index'
358
        index_to_pack = {}
5757.5.1 by Jelmer Vernooij
Move _DirectPackAccess to bzrlib.repofmt.pack_repo.
359
        access = _DirectPackAccess(index_to_pack,
5757.5.2 by Jelmer Vernooij
merge bzr.dev.
360
                                   reload_func=self._reload_func)
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
361
        if for_write:
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
362
            # Use new_pack
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
363
            if self.new_pack is None:
364
                raise AssertionError('No new pack has been set')
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
365
            index = getattr(self.new_pack, index_name)
366
            index_to_pack[index] = self.new_pack.access_tuple()
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
367
            index.set_optimize(for_size=True)
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
368
            access.set_writer(self.new_pack._writer, index,
369
                              self.new_pack.access_tuple())
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
370
            add_callback = index.add_nodes
371
        else:
372
            indices = []
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
373
            for pack in self.packs:
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
374
                sub_index = getattr(pack, index_name)
375
                index_to_pack[sub_index] = pack.access_tuple()
376
                indices.append(sub_index)
377
            index = _mod_index.CombinedGraphIndex(indices)
378
            add_callback = None
379
        vf = GroupCompressVersionedFiles(
380
            _GCGraphIndex(index,
381
                          add_callback=add_callback,
382
                          parents=parents,
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
383
                          is_locked=self._pack_collection.repo.is_locked),
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
384
            access=access,
385
            delta=delta)
386
        return vf
387
3735.31.24 by John Arbash Meinel
Start moving more things deeper inside the code.
388
    def _build_vfs(self, index_name, parents, delta):
389
        """Build the source and target VersionedFiles."""
390
        source_vf = self._build_vf(index_name, parents,
391
                                   delta, for_write=False)
392
        target_vf = self._build_vf(index_name, parents,
393
                                   delta, for_write=True)
394
        return source_vf, target_vf
395
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
396
    def _copy_stream(self, source_vf, target_vf, keys, message, vf_to_stream,
397
                     pb_offset):
398
        trace.mutter('repacking %d %s', len(keys), message)
3735.2.146 by John Arbash Meinel
Give the right progress message.
399
        self.pb.update('repacking %s' % (message,), pb_offset)
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
400
        child_pb = ui.ui_factory.nested_progress_bar()
401
        try:
402
            stream = vf_to_stream(source_vf, keys, message, child_pb)
3735.32.22 by John Arbash Meinel
Change the code so that the GCPacker knows to set reuse_blocks=False.
403
            for _ in target_vf._insert_record_stream(stream,
3735.32.28 by John Arbash Meinel
We can use 'random_id=True' when copying the streams.
404
                                                     random_id=True,
3735.32.22 by John Arbash Meinel
Change the code so that the GCPacker knows to set reuse_blocks=False.
405
                                                     reuse_blocks=False):
406
                pass
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
407
        finally:
408
            child_pb.finished()
409
410
    def _copy_revision_texts(self):
411
        source_vf, target_vf = self._build_vfs('revision', True, False)
412
        if not self.revision_keys:
413
            # We are doing a full fetch, aka 'pack'
414
            self.revision_keys = source_vf.keys()
415
        self._copy_stream(source_vf, target_vf, self.revision_keys,
416
                          'revisions', self._get_progress_stream, 1)
417
418
    def _copy_inventory_texts(self):
419
        source_vf, target_vf = self._build_vfs('inventory', True, True)
4597.1.6 by John Arbash Meinel
Add a test that inventory texts are preserved during pack.
420
        # It is not sufficient to just use self.revision_keys, as stacked
421
        # repositories can have more inventories than they have revisions.
422
        # One alternative would be to do something with
423
        # get_parent_map(self.revision_keys), but that shouldn't be any faster
424
        # than this.
425
        inventory_keys = source_vf.keys()
4597.1.8 by John Arbash Meinel
Add a safety check that there is an inventory being transmitted for
426
        missing_inventories = set(self.revision_keys).difference(inventory_keys)
427
        if missing_inventories:
4634.170.1 by John Arbash Meinel
Fix bug #437003. Autopacking should not fail for an
428
            # Go back to the original repo, to see if these are really missing
429
            # https://bugs.launchpad.net/bzr/+bug/437003
430
            # If we are packing a subset of the repo, it is fine to just have
431
            # the data in another Pack file, which is not included in this pack
432
            # operation.
433
            inv_index = self._pack_collection.repo.inventories._index
434
            pmap = inv_index.get_parent_map(missing_inventories)
435
            really_missing = missing_inventories.difference(pmap)
436
            if really_missing:
437
                missing_inventories = sorted(really_missing)
438
                raise ValueError('We are missing inventories for revisions: %s'
439
                    % (missing_inventories,))
4597.1.6 by John Arbash Meinel
Add a test that inventory texts are preserved during pack.
440
        self._copy_stream(source_vf, target_vf, inventory_keys,
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
441
                          'inventories', self._get_filtered_inv_stream, 2)
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
442
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
443
    def _get_chk_vfs_for_copy(self):
444
        return self._build_vfs('chk', False, False)
445
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
446
    def _copy_chk_texts(self):
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
447
        source_vf, target_vf = self._get_chk_vfs_for_copy()
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
448
        # TODO: This is technically spurious... if it is a performance issue,
449
        #       remove it
450
        total_keys = source_vf.keys()
451
        trace.mutter('repacking chk: %d id_to_entry roots,'
452
                     ' %d p_id_map roots, %d total keys',
453
                     len(self._chk_id_roots), len(self._chk_p_id_roots),
454
                     len(total_keys))
455
        self.pb.update('repacking chk', 3)
456
        child_pb = ui.ui_factory.nested_progress_bar()
457
        try:
458
            for stream in self._get_chk_streams(source_vf, total_keys,
459
                                                pb=child_pb):
3735.32.22 by John Arbash Meinel
Change the code so that the GCPacker knows to set reuse_blocks=False.
460
                for _ in target_vf._insert_record_stream(stream,
3735.32.28 by John Arbash Meinel
We can use 'random_id=True' when copying the streams.
461
                                                         random_id=True,
3735.32.22 by John Arbash Meinel
Change the code so that the GCPacker knows to set reuse_blocks=False.
462
                                                         reuse_blocks=False):
463
                    pass
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
464
        finally:
465
            child_pb.finished()
466
467
    def _copy_text_texts(self):
468
        source_vf, target_vf = self._build_vfs('text', True, True)
469
        # XXX: We don't walk the chk map to determine referenced (file_id,
470
        #      revision_id) keys.  We don't do it yet because you really need
471
        #      to filter out the ones that are present in the parents of the
472
        #      rev just before the ones you are copying, otherwise the filter
473
        #      is grabbing too many keys...
474
        text_keys = source_vf.keys()
475
        self._copy_stream(source_vf, target_vf, text_keys,
4511.2.1 by Matt Nordhoff
Fix pluralisation of gc's "repacking N texts" message
476
                          'texts', self._get_progress_stream, 4)
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
477
478
    def _copy_signature_texts(self):
479
        source_vf, target_vf = self._build_vfs('signature', False, False)
480
        signature_keys = source_vf.keys()
481
        signature_keys.intersection(self.revision_keys)
482
        self._copy_stream(source_vf, target_vf, signature_keys,
483
                          'signatures', self._get_progress_stream, 5)
484
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
485
    def _create_pack_from_packs(self):
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
486
        self.pb.update('repacking', 0, 7)
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
487
        self.new_pack = self.open_pack()
488
        # Is this necessary for GC ?
489
        self.new_pack.set_write_cache_size(1024*1024)
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
490
        self._copy_revision_texts()
491
        self._copy_inventory_texts()
492
        self._copy_chk_texts()
493
        self._copy_text_texts()
494
        self._copy_signature_texts()
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
495
        self.new_pack._check_references()
496
        if not self._use_pack(self.new_pack):
497
            self.new_pack.abort()
498
            return None
4476.3.31 by Andrew Bennetts
Fix 'pack already exists' test failure by checking if the pack name already exists when packing a single GC pack.
499
        self.new_pack.finish_content()
500
        if len(self.packs) == 1:
501
            old_pack = self.packs[0]
502
            if old_pack.name == self.new_pack._hash.hexdigest():
503
                # The single old pack was already optimally packed.
4476.3.68 by Andrew Bennetts
Review comments from John.
504
                trace.mutter('single pack %s was already optimally packed',
4476.3.67 by Andrew Bennetts
mutter when gc packer encounters a single, optimally packed pack.
505
                    old_pack.name)
4476.3.31 by Andrew Bennetts
Fix 'pack already exists' test failure by checking if the pack name already exists when packing a single GC pack.
506
                self.new_pack.abort()
507
                return None
3735.31.25 by John Arbash Meinel
Finish refactoring everything into _copy_X_texts() style.
508
        self.pb.update('finishing repack', 6, 7)
3735.31.23 by John Arbash Meinel
Change the GCPacker to inherit from Packer now that there isn't as much difference.
509
        self.new_pack.finish()
510
        self._pack_collection.allocate(self.new_pack)
511
        return self.new_pack
3735.31.15 by John Arbash Meinel
A bit more refactoring, try to clean up the _execute_packs code.
512
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
513
3735.31.27 by John Arbash Meinel
Implement GCCHKReconcilePacker.
514
class GCCHKReconcilePacker(GCCHKPacker):
515
    """A packer which regenerates indices etc as it copies.
516
517
    This is used by ``bzr reconcile`` to cause parent text pointers to be
518
    regenerated.
519
    """
520
521
    def __init__(self, *args, **kwargs):
522
        super(GCCHKReconcilePacker, self).__init__(*args, **kwargs)
523
        self._data_changed = False
524
        self._gather_text_refs = True
525
526
    def _copy_inventory_texts(self):
527
        source_vf, target_vf = self._build_vfs('inventory', True, True)
528
        self._copy_stream(source_vf, target_vf, self.revision_keys,
529
                          'inventories', self._get_filtered_inv_stream, 2)
530
        if source_vf.keys() != self.revision_keys:
531
            self._data_changed = True
532
533
    def _copy_text_texts(self):
534
        """generate what texts we should have and then copy."""
535
        source_vf, target_vf = self._build_vfs('text', True, True)
536
        trace.mutter('repacking %d texts', len(self._text_refs))
537
        self.pb.update("repacking texts", 4)
538
        # we have three major tasks here:
539
        # 1) generate the ideal index
540
        repo = self._pack_collection.repo
541
        # We want the one we just wrote, so base it on self.new_pack
542
        revision_vf = self._build_vf('revision', True, False, for_write=True)
543
        ancestor_keys = revision_vf.get_parent_map(revision_vf.keys())
544
        # Strip keys back into revision_ids.
545
        ancestors = dict((k[0], tuple([p[0] for p in parents]))
546
                         for k, parents in ancestor_keys.iteritems())
547
        del ancestor_keys
548
        # TODO: _generate_text_key_index should be much cheaper to generate from
549
        #       a chk repository, rather than the current implementation
550
        ideal_index = repo._generate_text_key_index(None, ancestors)
551
        file_id_parent_map = source_vf.get_parent_map(self._text_refs)
552
        # 2) generate a keys list that contains all the entries that can
553
        #    be used as-is, with corrected parents.
554
        ok_keys = []
555
        new_parent_keys = {} # (key, parent_keys)
556
        discarded_keys = []
557
        NULL_REVISION = _mod_revision.NULL_REVISION
558
        for key in self._text_refs:
559
            # 0 - index
560
            # 1 - key
561
            # 2 - value
562
            # 3 - refs
563
            try:
564
                ideal_parents = tuple(ideal_index[key])
565
            except KeyError:
566
                discarded_keys.append(key)
567
                self._data_changed = True
568
            else:
569
                if ideal_parents == (NULL_REVISION,):
570
                    ideal_parents = ()
571
                source_parents = file_id_parent_map[key]
572
                if ideal_parents == source_parents:
573
                    # no change needed.
574
                    ok_keys.append(key)
575
                else:
576
                    # We need to change the parent graph, but we don't need to
577
                    # re-insert the text (since we don't pun the compression
578
                    # parent with the parents list)
579
                    self._data_changed = True
580
                    new_parent_keys[key] = ideal_parents
581
        # we're finished with some data.
582
        del ideal_index
583
        del file_id_parent_map
584
        # 3) bulk copy the data, updating records than need it
585
        def _update_parents_for_texts():
586
            stream = source_vf.get_record_stream(self._text_refs,
587
                'groupcompress', False)
588
            for record in stream:
589
                if record.key in new_parent_keys:
590
                    record.parents = new_parent_keys[record.key]
591
                yield record
592
        target_vf.insert_record_stream(_update_parents_for_texts())
593
594
    def _use_pack(self, new_pack):
595
        """Override _use_pack to check for reconcile having changed content."""
596
        return new_pack.data_inserted() and self._data_changed
597
598
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
599
class GCCHKCanonicalizingPacker(GCCHKPacker):
600
    """A packer that ensures inventories have canonical-form CHK maps.
601
    
602
    Ideally this would be part of reconcile, but it's very slow and rarely
5375.1.5 by Andrew Bennetts
Tweak comment.
603
    needed.  (It repairs repositories affected by
604
    https://bugs.launchpad.net/bzr/+bug/522637).
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
605
    """
606
607
    def __init__(self, *args, **kwargs):
608
        super(GCCHKCanonicalizingPacker, self).__init__(*args, **kwargs)
609
        self._data_changed = False
5757.6.1 by Jelmer Vernooij
Don't make PackRepository derive from KnitRepository.
610
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
611
    def _exhaust_stream(self, source_vf, keys, message, vf_to_stream, pb_offset):
612
        """Create and exhaust a stream, but don't insert it.
5757.6.1 by Jelmer Vernooij
Don't make PackRepository derive from KnitRepository.
613
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
614
        This is useful to get the side-effects of generating a stream.
615
        """
616
        self.pb.update('scanning %s' % (message,), pb_offset)
617
        child_pb = ui.ui_factory.nested_progress_bar()
618
        try:
619
            list(vf_to_stream(source_vf, keys, message, child_pb))
620
        finally:
621
            child_pb.finished()
622
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
623
    def _copy_inventory_texts(self):
624
        source_vf, target_vf = self._build_vfs('inventory', True, True)
625
        source_chk_vf, target_chk_vf = self._get_chk_vfs_for_copy()
626
        inventory_keys = source_vf.keys()
5375.1.2 by Andrew Bennetts
Add a hack to avoid creating a massively bloated repo that needs repacking by avoiding duplicate insertion of CHK keys.
627
        # First, copy the existing CHKs on the assumption that most of them
628
        # will be correct.  This will save us from having to reinsert (and
5375.1.4 by Andrew Bennetts
Put NoDupeAddLinesDecorator in versionedfiles.py, and make it slightly more reusable.
629
        # recompress) these records later at the cost of perhaps preserving a
630
        # few unused CHKs. 
5375.1.2 by Andrew Bennetts
Add a hack to avoid creating a massively bloated repo that needs repacking by avoiding duplicate insertion of CHK keys.
631
        # (Iterate but don't insert _get_filtered_inv_stream to populate the
632
        # variables needed by GCCHKPacker._copy_chk_texts.)
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
633
        self._exhaust_stream(source_vf, inventory_keys, 'inventories',
634
                self._get_filtered_inv_stream, 2)
5375.1.2 by Andrew Bennetts
Add a hack to avoid creating a massively bloated repo that needs repacking by avoiding duplicate insertion of CHK keys.
635
        GCCHKPacker._copy_chk_texts(self)
5375.1.4 by Andrew Bennetts
Put NoDupeAddLinesDecorator in versionedfiles.py, and make it slightly more reusable.
636
        # Now copy and fix the inventories, and any regenerated CHKs.
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
637
        def chk_canonicalizing_inv_stream(source_vf, keys, message, pb=None):
638
            return self._get_filtered_canonicalizing_inv_stream(
639
                source_vf, keys, message, pb, source_chk_vf, target_chk_vf)
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
640
        self._copy_stream(source_vf, target_vf, inventory_keys,
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
641
                          'inventories', chk_canonicalizing_inv_stream, 4)
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
642
643
    def _copy_chk_texts(self):
5375.1.2 by Andrew Bennetts
Add a hack to avoid creating a massively bloated repo that needs repacking by avoiding duplicate insertion of CHK keys.
644
        # No-op; in this class this happens during _copy_inventory_texts.
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
645
        pass
646
647
    def _get_filtered_canonicalizing_inv_stream(self, source_vf, keys, message,
648
            pb=None, source_chk_vf=None, target_chk_vf=None):
649
        """Filter the texts of inventories, regenerating CHKs to make sure they
650
        are canonical.
651
        """
652
        total_keys = len(keys)
5375.1.4 by Andrew Bennetts
Put NoDupeAddLinesDecorator in versionedfiles.py, and make it slightly more reusable.
653
        target_chk_vf = versionedfile.NoDupeAddLinesDecorator(target_chk_vf)
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
654
        def _filtered_inv_stream():
655
            stream = source_vf.get_record_stream(keys, 'groupcompress', True)
656
            search_key_name = None
657
            for idx, record in enumerate(stream):
658
                # Inventories should always be with revisions; assume success.
659
                bytes = record.get_bytes_as('fulltext')
5375.1.4 by Andrew Bennetts
Put NoDupeAddLinesDecorator in versionedfiles.py, and make it slightly more reusable.
660
                chk_inv = inventory.CHKInventory.deserialise(
661
                    source_chk_vf, bytes, record.key)
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
662
                if pb is not None:
663
                    pb.update('inv', idx, total_keys)
664
                chk_inv.id_to_entry._ensure_root()
665
                if search_key_name is None:
5375.1.4 by Andrew Bennetts
Put NoDupeAddLinesDecorator in versionedfiles.py, and make it slightly more reusable.
666
                    # Find the name corresponding to the search_key_func
5375.1.2 by Andrew Bennetts
Add a hack to avoid creating a massively bloated repo that needs repacking by avoiding duplicate insertion of CHK keys.
667
                    search_key_reg = chk_map.search_key_registry
668
                    for search_key_name, func in search_key_reg.iteritems():
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
669
                        if func == chk_inv.id_to_entry._search_key_func:
670
                            break
671
                canonical_inv = inventory.CHKInventory.from_inventory(
672
                    target_chk_vf, chk_inv,
673
                    maximum_size=chk_inv.id_to_entry._root_node._maximum_size,
674
                    search_key_name=search_key_name)
675
                if chk_inv.id_to_entry.key() != canonical_inv.id_to_entry.key():
5375.1.4 by Andrew Bennetts
Put NoDupeAddLinesDecorator in versionedfiles.py, and make it slightly more reusable.
676
                    trace.mutter(
677
                        'Non-canonical CHK map for id_to_entry of inv: %s '
678
                        '(root is %s, should be %s)' % (chk_inv.revision_id,
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
679
                        chk_inv.id_to_entry.key()[0],
680
                        canonical_inv.id_to_entry.key()[0]))
681
                    self._data_changed = True
5375.1.2 by Andrew Bennetts
Add a hack to avoid creating a massively bloated repo that needs repacking by avoiding duplicate insertion of CHK keys.
682
                p_id_map = chk_inv.parent_id_basename_to_file_id
683
                p_id_map._ensure_root()
684
                canon_p_id_map = canonical_inv.parent_id_basename_to_file_id
685
                if p_id_map.key() != canon_p_id_map.key():
5375.1.4 by Andrew Bennetts
Put NoDupeAddLinesDecorator in versionedfiles.py, and make it slightly more reusable.
686
                    trace.mutter(
687
                        'Non-canonical CHK map for parent_id_to_basename of '
688
                        'inv: %s (root is %s, should be %s)'
5375.1.2 by Andrew Bennetts
Add a hack to avoid creating a massively bloated repo that needs repacking by avoiding duplicate insertion of CHK keys.
689
                        % (chk_inv.revision_id, p_id_map.key()[0],
690
                           canon_p_id_map.key()[0]))
5375.1.1 by Andrew Bennetts
Implement GCCHKCanonicalizingPacker to fix repos affected by bug 522637
691
                    self._data_changed = True
692
                yield versionedfile.ChunkedContentFactory(record.key,
693
                        record.parents, record.sha1,
694
                        canonical_inv.to_lines())
695
            # We have finished processing all of the inventory records, we
696
            # don't need these sets anymore
697
        return _filtered_inv_stream()
698
699
    def _use_pack(self, new_pack):
700
        """Override _use_pack to check for reconcile having changed content."""
701
        return new_pack.data_inserted() and self._data_changed
702
703
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
704
class GCRepositoryPackCollection(RepositoryPackCollection):
705
706
    pack_factory = GCPack
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
707
    resumed_pack_factory = ResumedGCPack
5757.7.3 by Jelmer Vernooij
Move more knitpack-specific functionality out of Packer.
708
    normal_packer_class = GCCHKPacker
709
    optimising_packer_class = GCCHKPacker
3735.31.22 by John Arbash Meinel
Factor out the copying code into GCPacker.
710
4634.29.11 by Andrew Bennetts
Move chk_bytes-aware _check_new_inventories to GCRepositoryPackCollection.
711
    def _check_new_inventories(self):
712
        """Detect missing inventories or chk root entries for the new revisions
713
        in this write group.
714
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
715
        :returns: list of strs, summarising any problems found.  If the list is
716
            empty no problems were found.
4634.29.11 by Andrew Bennetts
Move chk_bytes-aware _check_new_inventories to GCRepositoryPackCollection.
717
        """
718
        # Ensure that all revisions added in this write group have:
719
        #   - corresponding inventories,
720
        #   - chk root entries for those inventories,
721
        #   - and any present parent inventories have their chk root
722
        #     entries too.
723
        # And all this should be independent of any fallback repository.
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
724
        problems = []
4634.29.11 by Andrew Bennetts
Move chk_bytes-aware _check_new_inventories to GCRepositoryPackCollection.
725
        key_deps = self.repo.revisions._index._key_dependencies
726
        new_revisions_keys = key_deps.get_new_keys()
727
        no_fallback_inv_index = self.repo.inventories._index
728
        no_fallback_chk_bytes_index = self.repo.chk_bytes._index
4634.35.5 by Andrew Bennetts
Check for missing texts, too.
729
        no_fallback_texts_index = self.repo.texts._index
4634.29.11 by Andrew Bennetts
Move chk_bytes-aware _check_new_inventories to GCRepositoryPackCollection.
730
        inv_parent_map = no_fallback_inv_index.get_parent_map(
731
            new_revisions_keys)
732
        # Are any inventories for corresponding to the new revisions missing?
733
        corresponding_invs = set(inv_parent_map)
734
        missing_corresponding = set(new_revisions_keys)
735
        missing_corresponding.difference_update(corresponding_invs)
736
        if missing_corresponding:
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
737
            problems.append("inventories missing for revisions %s" %
738
                (sorted(missing_corresponding),))
739
            return problems
4634.29.11 by Andrew Bennetts
Move chk_bytes-aware _check_new_inventories to GCRepositoryPackCollection.
740
        # Are any chk root entries missing for any inventories?  This includes
741
        # any present parent inventories, which may be used when calculating
742
        # deltas for streaming.
743
        all_inv_keys = set(corresponding_invs)
744
        for parent_inv_keys in inv_parent_map.itervalues():
745
            all_inv_keys.update(parent_inv_keys)
746
        # Filter out ghost parents.
747
        all_inv_keys.intersection_update(
748
            no_fallback_inv_index.get_parent_map(all_inv_keys))
4634.35.1 by Andrew Bennetts
Check for all necessary chk nodes, not just roots.
749
        parent_invs_only_keys = all_inv_keys.symmetric_difference(
750
            corresponding_invs)
4634.29.11 by Andrew Bennetts
Move chk_bytes-aware _check_new_inventories to GCRepositoryPackCollection.
751
        all_missing = set()
752
        inv_ids = [key[-1] for key in all_inv_keys]
4634.35.7 by Andrew Bennetts
Reuse a little more logic for calculating (un)interesting chk root keys.
753
        parent_invs_only_ids = [key[-1] for key in parent_invs_only_keys]
754
        root_key_info = _build_interesting_key_sets(
755
            self.repo, inv_ids, parent_invs_only_ids)
756
        expected_chk_roots = root_key_info.all_keys()
757
        present_chk_roots = no_fallback_chk_bytes_index.get_parent_map(
758
            expected_chk_roots)
759
        missing_chk_roots = expected_chk_roots.difference(present_chk_roots)
760
        if missing_chk_roots:
6542.1.1 by Jelmer Vernooij
Mention 'bzr reconcile --canonicalize-chks' when hitting a missing chk root reference error.
761
            problems.append(
762
                "missing referenced chk root keys: %s."
763
                "Run 'bzr reconcile --canonicalize-chks' on the affected "
764
                "repository."
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
765
                % (sorted(missing_chk_roots),))
4634.35.1 by Andrew Bennetts
Check for all necessary chk nodes, not just roots.
766
            # Don't bother checking any further.
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
767
            return problems
4634.35.7 by Andrew Bennetts
Reuse a little more logic for calculating (un)interesting chk root keys.
768
        # Find all interesting chk_bytes records, and make sure they are
769
        # present, as well as the text keys they reference.
4634.35.1 by Andrew Bennetts
Check for all necessary chk nodes, not just roots.
770
        chk_bytes_no_fallbacks = self.repo.chk_bytes.without_fallbacks()
771
        chk_bytes_no_fallbacks._search_key_func = \
772
            self.repo.chk_bytes._search_key_func
773
        chk_diff = chk_map.iter_interesting_nodes(
4634.35.7 by Andrew Bennetts
Reuse a little more logic for calculating (un)interesting chk root keys.
774
            chk_bytes_no_fallbacks, root_key_info.interesting_root_keys,
775
            root_key_info.uninteresting_root_keys)
4634.35.5 by Andrew Bennetts
Check for missing texts, too.
776
        text_keys = set()
777
        try:
5218.2.1 by John Arbash Meinel
Implement a compiled extension for parsing the text key out of a CHKInventory value.
778
            for record in _filter_text_keys(chk_diff, text_keys,
779
                                            chk_map._bytes_to_text_key):
4634.35.6 by Andrew Bennetts
Start reusing common logic for calculating text keys.
780
                pass
4634.35.5 by Andrew Bennetts
Check for missing texts, too.
781
        except errors.NoSuchRevision, e:
4634.35.6 by Andrew Bennetts
Start reusing common logic for calculating text keys.
782
            # XXX: It would be nice if we could give a more precise error here.
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
783
            problems.append("missing chk node(s) for id_to_entry maps")
4634.35.5 by Andrew Bennetts
Check for missing texts, too.
784
        chk_diff = chk_map.iter_interesting_nodes(
4634.35.7 by Andrew Bennetts
Reuse a little more logic for calculating (un)interesting chk root keys.
785
            chk_bytes_no_fallbacks, root_key_info.interesting_pid_root_keys,
786
            root_key_info.uninteresting_pid_root_keys)
4634.35.1 by Andrew Bennetts
Check for all necessary chk nodes, not just roots.
787
        try:
788
            for interesting_rec, interesting_map in chk_diff:
789
                pass
790
        except errors.NoSuchRevision, e:
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
791
            problems.append(
792
                "missing chk node(s) for parent_id_basename_to_file_id maps")
4634.35.5 by Andrew Bennetts
Check for missing texts, too.
793
        present_text_keys = no_fallback_texts_index.get_parent_map(text_keys)
794
        missing_text_keys = text_keys.difference(present_text_keys)
795
        if missing_text_keys:
4634.35.8 by Andrew Bennetts
Return a list of problem descriptions rather than raising BzrCheckError on the first problem.
796
            problems.append("missing text keys: %r"
797
                % (sorted(missing_text_keys),))
798
        return problems
4634.35.5 by Andrew Bennetts
Check for missing texts, too.
799
0.17.9 by Robert Collins
Initial stab at repository format support.
800
5757.2.1 by Jelmer Vernooij
Don't have CHK stream source depend on knit pack stream source.
801
class CHKInventoryRepository(PackRepository):
802
    """subclass of PackRepository that uses CHK based inventories."""
0.17.26 by Robert Collins
Working better --gc-plain-chk.
803
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
804
    def __init__(self, _format, a_bzrdir, control_files, _commit_builder_class,
805
        _serializer):
806
        """Overridden to change pack collection class."""
5757.8.10 by Jelmer Vernooij
Merge direct pack access branch.
807
        super(CHKInventoryRepository, self).__init__(_format, a_bzrdir,
808
            control_files, _commit_builder_class, _serializer)
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
809
        index_transport = self._transport.clone('indices')
810
        self._pack_collection = GCRepositoryPackCollection(self,
811
            self._transport, index_transport,
812
            self._transport.clone('upload'),
813
            self._transport.clone('packs'),
814
            _format.index_builder_class,
815
            _format.index_class,
816
            use_chk_index=self._format.supports_chks,
817
            )
818
        self.inventories = GroupCompressVersionedFiles(
819
            _GCGraphIndex(self._pack_collection.inventory_index.combined_index,
820
                add_callback=self._pack_collection.inventory_index.add_callback,
4465.2.5 by Aaron Bentley
Make inconsistency in skipped records fatal for revisions.
821
                parents=True, is_locked=self.is_locked,
4634.29.6 by Andrew Bennetts
Put new key tracking in _KeyRefs rather than alongside it.
822
                inconsistency_fatal=False),
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
823
            access=self._pack_collection.inventory_index.data_access)
824
        self.revisions = GroupCompressVersionedFiles(
825
            _GCGraphIndex(self._pack_collection.revision_index.combined_index,
826
                add_callback=self._pack_collection.revision_index.add_callback,
4343.3.21 by John Arbash Meinel
Implement get_missing_parents in terms of _KeyRefs.
827
                parents=True, is_locked=self.is_locked,
4634.29.6 by Andrew Bennetts
Put new key tracking in _KeyRefs rather than alongside it.
828
                track_external_parent_refs=True, track_new_keys=True),
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
829
            access=self._pack_collection.revision_index.data_access,
830
            delta=False)
831
        self.signatures = GroupCompressVersionedFiles(
832
            _GCGraphIndex(self._pack_collection.signature_index.combined_index,
833
                add_callback=self._pack_collection.signature_index.add_callback,
4465.2.5 by Aaron Bentley
Make inconsistency in skipped records fatal for revisions.
834
                parents=False, is_locked=self.is_locked,
835
                inconsistency_fatal=False),
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
836
            access=self._pack_collection.signature_index.data_access,
837
            delta=False)
838
        self.texts = GroupCompressVersionedFiles(
839
            _GCGraphIndex(self._pack_collection.text_index.combined_index,
840
                add_callback=self._pack_collection.text_index.add_callback,
4465.2.5 by Aaron Bentley
Make inconsistency in skipped records fatal for revisions.
841
                parents=True, is_locked=self.is_locked,
842
                inconsistency_fatal=False),
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
843
            access=self._pack_collection.text_index.data_access)
844
        # No parents, individual CHK pages don't have specific ancestry
845
        self.chk_bytes = GroupCompressVersionedFiles(
846
            _GCGraphIndex(self._pack_collection.chk_index.combined_index,
847
                add_callback=self._pack_collection.chk_index.add_callback,
4465.2.5 by Aaron Bentley
Make inconsistency in skipped records fatal for revisions.
848
                parents=False, is_locked=self.is_locked,
849
                inconsistency_fatal=False),
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
850
            access=self._pack_collection.chk_index.data_access)
4476.1.17 by John Arbash Meinel
Start running all of the iter_interesting_nodes tests
851
        search_key_name = self._format._serializer.search_key_name
852
        search_key_func = chk_map.search_key_registry.get(search_key_name)
853
        self.chk_bytes._search_key_func = search_key_func
3735.31.4 by John Arbash Meinel
Continue trying to reduce the friction for the groupcompress repo formats.
854
        # True when the repository object is 'write locked' (as opposed to the
855
        # physical lock only taken out around changes to the pack-names list.)
856
        # Another way to represent this would be a decorator around the control
857
        # files object that presents logical locks as physical ones - if this
858
        # gets ugly consider that alternative design. RBC 20071011
859
        self._write_lock_count = 0
860
        self._transaction = None
861
        # for tests
862
        self._reconcile_does_inventory_gc = True
863
        self._reconcile_fixes_text_parents = True
864
        self._reconcile_backsup_inventory = False
0.17.26 by Robert Collins
Working better --gc-plain-chk.
865
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
866
    def _add_inventory_checked(self, revision_id, inv, parents):
867
        """Add inv to the repository after checking the inputs.
868
869
        This function can be overridden to allow different inventory styles.
870
871
        :seealso: add_inventory, for the contract.
872
        """
873
        # make inventory
874
        serializer = self._format._serializer
875
        result = inventory.CHKInventory.from_inventory(self.chk_bytes, inv,
876
            maximum_size=serializer.maximum_size,
877
            search_key_name=serializer.search_key_name)
878
        inv_lines = result.to_lines()
879
        return self._inventory_add_lines(revision_id, parents,
880
            inv_lines, check_content=False)
881
4413.5.11 by John Arbash Meinel
Pull out the common 'populate this CHKInventory' code out into a helper
882
    def _create_inv_from_null(self, delta, revision_id):
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
883
        """This will mutate new_inv directly.
884
885
        This is a simplified form of create_by_apply_delta which knows that all
886
        the old values must be None, so everything is a create.
887
        """
4413.5.4 by John Arbash Meinel
Change CHKMap.from_dict to create a LeafNode and split it.
888
        serializer = self._format._serializer
889
        new_inv = inventory.CHKInventory(serializer.search_key_name)
4413.5.11 by John Arbash Meinel
Pull out the common 'populate this CHKInventory' code out into a helper
890
        new_inv.revision_id = revision_id
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
891
        entry_to_bytes = new_inv._entry_to_bytes
4413.5.4 by John Arbash Meinel
Change CHKMap.from_dict to create a LeafNode and split it.
892
        id_to_entry_dict = {}
893
        parent_id_basename_dict = {}
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
894
        for old_path, new_path, file_id, entry in delta:
4413.5.8 by John Arbash Meinel
Change some asserts into raise: calls.
895
            if old_path is not None:
896
                raise ValueError('Invalid delta, somebody tried to delete %r'
897
                                 ' from the NULL_REVISION'
898
                                 % ((old_path, file_id),))
899
            if new_path is None:
900
                raise ValueError('Invalid delta, delta from NULL_REVISION has'
901
                                 ' no new_path %r' % (file_id,))
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
902
            if new_path == '':
903
                new_inv.root_id = file_id
4679.9.15 by John Arbash Meinel
Cleanup some code paths. Make _check_key a helper that can be used
904
                parent_id_basename_key = StaticTuple('', '').intern()
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
905
            else:
906
                utf8_entry_name = entry.name.encode('utf-8')
4679.9.4 by John Arbash Meinel
A bit broken, but getting there.
907
                parent_id_basename_key = StaticTuple(entry.parent_id,
4679.9.15 by John Arbash Meinel
Cleanup some code paths. Make _check_key a helper that can be used
908
                                                     utf8_entry_name).intern()
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
909
            new_value = entry_to_bytes(entry)
4413.5.10 by John Arbash Meinel
Clean upt the test_inv tests that assumed _root_node was real and not just a key.
910
            # Populate Caches?
911
            # new_inv._path_to_fileid_cache[new_path] = file_id
4679.9.4 by John Arbash Meinel
A bit broken, but getting there.
912
            key = StaticTuple(file_id).intern()
913
            id_to_entry_dict[key] = new_value
4413.5.4 by John Arbash Meinel
Change CHKMap.from_dict to create a LeafNode and split it.
914
            parent_id_basename_dict[parent_id_basename_key] = file_id
915
4413.5.11 by John Arbash Meinel
Pull out the common 'populate this CHKInventory' code out into a helper
916
        new_inv._populate_from_dicts(self.chk_bytes, id_to_entry_dict,
917
            parent_id_basename_dict, maximum_size=serializer.maximum_size)
4413.5.4 by John Arbash Meinel
Change CHKMap.from_dict to create a LeafNode and split it.
918
        return new_inv
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
919
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
920
    def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
921
                               parents, basis_inv=None, propagate_caches=False):
922
        """Add a new inventory expressed as a delta against another revision.
923
924
        :param basis_revision_id: The inventory id the delta was created
925
            against.
926
        :param delta: The inventory delta (see Inventory.apply_delta for
927
            details).
928
        :param new_revision_id: The revision id that the inventory is being
929
            added for.
930
        :param parents: The revision ids of the parents that revision_id is
931
            known to have and are in the repository already. These are supplied
932
            for repositories that depend on the inventory graph for revision
933
            graph access, as well as for those that pun ancestry with delta
934
            compression.
935
        :param basis_inv: The basis inventory if it is already known,
936
            otherwise None.
937
        :param propagate_caches: If True, the caches for this inventory are
938
          copied to and updated for the result if possible.
939
940
        :returns: (validator, new_inv)
941
            The validator(which is a sha1 digest, though what is sha'd is
942
            repository format specific) of the serialized inventory, and the
943
            resulting inventory.
944
        """
945
        if not self.is_in_write_group():
946
            raise AssertionError("%r not in write group" % (self,))
947
        _mod_revision.check_not_reserved_id(new_revision_id)
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
948
        basis_tree = None
949
        if basis_inv is None:
950
            if basis_revision_id == _mod_revision.NULL_REVISION:
4413.5.4 by John Arbash Meinel
Change CHKMap.from_dict to create a LeafNode and split it.
951
                new_inv = self._create_inv_from_null(delta, new_revision_id)
5222.1.1 by Aaron Bentley
Refuse to commit trees with no root.
952
                if new_inv.root_id is None:
953
                    raise errors.RootMissing()
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
954
                inv_lines = new_inv.to_lines()
955
                return self._inventory_add_lines(new_revision_id, parents,
956
                    inv_lines, check_content=False), new_inv
957
            else:
958
                basis_tree = self.revision_tree(basis_revision_id)
959
                basis_tree.lock_read()
6405.2.5 by Jelmer Vernooij
Add root_inventory.
960
                basis_inv = basis_tree.root_inventory
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
961
        try:
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
962
            result = basis_inv.create_by_apply_delta(delta, new_revision_id,
963
                propagate_caches=propagate_caches)
964
            inv_lines = result.to_lines()
965
            return self._inventory_add_lines(new_revision_id, parents,
966
                inv_lines, check_content=False), result
967
        finally:
4413.5.1 by John Arbash Meinel
Prototype an alternative way to handle 'first commit'
968
            if basis_tree is not None:
969
                basis_tree.unlock()
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
970
4988.3.3 by Jelmer Vernooij
rename Repository.deserialise_inventory to Repository._deserialise_inventory.
971
    def _deserialise_inventory(self, revision_id, bytes):
4332.3.27 by Robert Collins
Fix deserialise_inventory to work with CHK repositories.
972
        return inventory.CHKInventory.deserialise(self.chk_bytes, bytes,
973
            (revision_id,))
974
4476.3.1 by Andrew Bennetts
Initial hacking to use inventory deltas for cross-format fetch.
975
    def _iter_inventories(self, revision_ids, ordering):
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
976
        """Iterate over many inventory objects."""
4476.3.68 by Andrew Bennetts
Review comments from John.
977
        if ordering is None:
978
            ordering = 'unordered'
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
979
        keys = [(revision_id,) for revision_id in revision_ids]
4476.3.1 by Andrew Bennetts
Initial hacking to use inventory deltas for cross-format fetch.
980
        stream = self.inventories.get_record_stream(keys, ordering, True)
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
981
        texts = {}
982
        for record in stream:
983
            if record.storage_kind != 'absent':
984
                texts[record.key] = record.get_bytes_as('fulltext')
985
            else:
6282.6.8 by Jelmer Vernooij
Adjust _iter_inventories contract slightly, don't raise NoSuchRevision immediately
986
                texts[record.key] = None
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
987
        for key in keys:
6282.6.8 by Jelmer Vernooij
Adjust _iter_inventories contract slightly, don't raise NoSuchRevision immediately
988
            bytes = texts[key]
989
            if bytes is None:
990
                yield (None, key[-1])
991
            else:
992
                yield (inventory.CHKInventory.deserialise(
993
                    self.chk_bytes, bytes, key), key[-1])
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
994
6282.6.8 by Jelmer Vernooij
Adjust _iter_inventories contract slightly, don't raise NoSuchRevision immediately
995
    def _get_inventory_xml(self, revision_id):
996
        """Get serialized inventory as a string."""
4606.5.1 by Robert Collins
Support get_inventory_xml on CHKRepository.
997
        # Without a native 'xml' inventory, this method doesn't make sense.
998
        # However older working trees, and older bundles want it - so we supply
4988.5.1 by Jelmer Vernooij
Rename Repository.get_inventory_xml -> Repository._get_inventory_xml.
999
        # it allowing _get_inventory_xml to work. Bundles currently use the
4606.5.1 by Robert Collins
Support get_inventory_xml on CHKRepository.
1000
        # serializer directly; this also isn't ideal, but there isn't an xml
6282.6.8 by Jelmer Vernooij
Adjust _iter_inventories contract slightly, don't raise NoSuchRevision immediately
1001
        # iteration interface offered at all for repositories.
6282.6.19 by Jelmer Vernooij
More test fixes.
1002
        return self._serializer.write_inventory_to_string(
1003
            self.get_inventory(revision_id))
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1004
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1005
    def _find_present_inventory_keys(self, revision_keys):
1006
        parent_map = self.inventories.get_parent_map(revision_keys)
1007
        present_inventory_keys = set(k for k in parent_map)
1008
        return present_inventory_keys
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1009
1010
    def fileids_altered_by_revision_ids(self, revision_ids, _inv_weave=None):
1011
        """Find the file ids and versions affected by revisions.
1012
1013
        :param revisions: an iterable containing revision ids.
1014
        :param _inv_weave: The inventory weave from this repository or None.
1015
            If None, the inventory weave will be opened automatically.
1016
        :return: a dictionary mapping altered file-ids to an iterable of
1017
            revision_ids. Each altered file-ids has the exact revision_ids that
1018
            altered it listed explicitly.
1019
        """
4343.3.23 by John Arbash Meinel
Change RepositoryCHK1.fileids_altered_by to handle ghosts the way XML does.
1020
        rich_root = self.supports_rich_root()
1021
        bytes_to_info = inventory.CHKInventory._bytes_to_utf8name_key
1022
        file_id_revisions = {}
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1023
        pb = ui.ui_factory.nested_progress_bar()
1024
        try:
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1025
            revision_keys = [(r,) for r in revision_ids]
1026
            parent_keys = self._find_parent_keys_of_revisions(revision_keys)
1027
            # TODO: instead of using _find_present_inventory_keys, change the
1028
            #       code paths to allow missing inventories to be tolerated.
1029
            #       However, we only want to tolerate missing parent
1030
            #       inventories, not missing inventories for revision_ids
1031
            present_parent_inv_keys = self._find_present_inventory_keys(
1032
                                        parent_keys)
1033
            present_parent_inv_ids = set(
1034
                [k[-1] for k in present_parent_inv_keys])
1035
            inventories_to_read = set(revision_ids)
1036
            inventories_to_read.update(present_parent_inv_ids)
4634.35.7 by Andrew Bennetts
Reuse a little more logic for calculating (un)interesting chk root keys.
1037
            root_key_info = _build_interesting_key_sets(
1038
                self, inventories_to_read, present_parent_inv_ids)
1039
            interesting_root_keys = root_key_info.interesting_root_keys
1040
            uninteresting_root_keys = root_key_info.uninteresting_root_keys
4343.3.23 by John Arbash Meinel
Change RepositoryCHK1.fileids_altered_by to handle ghosts the way XML does.
1041
            chk_bytes = self.chk_bytes
1042
            for record, items in chk_map.iter_interesting_nodes(chk_bytes,
1043
                        interesting_root_keys, uninteresting_root_keys,
1044
                        pb=pb):
1045
                for name, bytes in items:
1046
                    (name_utf8, file_id, revision_id) = bytes_to_info(bytes)
4679.9.23 by John Arbash Meinel
Mostly TODO entries.
1047
                    # TODO: consider interning file_id, revision_id here, or
1048
                    #       pushing that intern() into bytes_to_info()
1049
                    # TODO: rich_root should always be True here, for all
1050
                    #       repositories that support chk_bytes
4343.3.23 by John Arbash Meinel
Change RepositoryCHK1.fileids_altered_by to handle ghosts the way XML does.
1051
                    if not rich_root and name_utf8 == '':
1052
                        continue
1053
                    try:
1054
                        file_id_revisions[file_id].add(revision_id)
1055
                    except KeyError:
1056
                        file_id_revisions[file_id] = set([revision_id])
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1057
        finally:
1058
            pb.finished()
4343.3.23 by John Arbash Meinel
Change RepositoryCHK1.fileids_altered_by to handle ghosts the way XML does.
1059
        return file_id_revisions
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1060
1061
    def find_text_key_references(self):
1062
        """Find the text key references within the repository.
1063
1064
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
1065
            to whether they were referred to by the inventory of the
1066
            revision_id that they contain. The inventory texts from all present
1067
            revision ids are assessed to generate this report.
1068
        """
1069
        # XXX: Slow version but correct: rewrite as a series of delta
1070
        # examinations/direct tree traversal. Note that that will require care
1071
        # as a common node is reachable both from the inventory that added it,
1072
        # and others afterwards.
1073
        revision_keys = self.revisions.keys()
1074
        result = {}
1075
        rich_roots = self.supports_rich_root()
1076
        pb = ui.ui_factory.nested_progress_bar()
1077
        try:
1078
            all_revs = self.all_revision_ids()
1079
            total = len(all_revs)
1080
            for pos, inv in enumerate(self.iter_inventories(all_revs)):
1081
                pb.update("Finding text references", pos, total)
1082
                for _, entry in inv.iter_entries():
1083
                    if not rich_roots and entry.file_id == inv.root_id:
1084
                        continue
1085
                    key = (entry.file_id, entry.revision)
1086
                    result.setdefault(key, False)
1087
                    if entry.revision == inv.revision_id:
1088
                        result[key] = True
1089
            return result
1090
        finally:
1091
            pb.finished()
1092
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
1093
    @needs_write_lock
1094
    def reconcile_canonicalize_chks(self):
1095
        """Reconcile this repository to make sure all CHKs are in canonical
1096
        form.
1097
        """
1098
        from bzrlib.reconcile import PackReconciler
1099
        reconciler = PackReconciler(self, thorough=True, canonicalize_chks=True)
1100
        reconciler.reconcile()
1101
        return reconciler
1102
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1103
    def _reconcile_pack(self, collection, packs, extension, revs, pb):
1104
        packer = GCCHKReconcilePacker(collection, packs, extension)
1105
        return packer.pack(pb)
1106
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
1107
    def _canonicalize_chks_pack(self, collection, packs, extension, revs, pb):
1108
        packer = GCCHKCanonicalizingPacker(collection, packs, extension, revs)
1109
        return packer.pack(pb)
1110
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1111
    def _get_source(self, to_format):
1112
        """Return a source for streaming from this repository."""
4476.3.74 by Andrew Bennetts
Remove unnecessary clause from if.
1113
        if self._format._serializer == to_format._serializer:
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1114
            # We must be exactly the same format, otherwise stuff like the chk
4476.3.29 by Andrew Bennetts
Add Repository.get_stream_1.18 verb.
1115
            # page layout might be different.
1116
            # Actually, this test is just slightly looser than exact so that
1117
            # CHK2 <-> 2a transfers will work.
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1118
            return GroupCHKStreamSource(self, to_format)
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1119
        return super(CHKInventoryRepository, self)._get_source(to_format)
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1120
5757.6.1 by Jelmer Vernooij
Don't make PackRepository derive from KnitRepository.
1121
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
1122
        """Find revisions with different parent lists in the revision object
1123
        and in the index graph.
1124
1125
        :param revisions_iterator: None, or an iterator of (revid,
1126
            Revision-or-None). This iterator controls the revisions checked.
1127
        :returns: an iterator yielding tuples of (revison-id, parents-in-index,
1128
            parents-in-revision).
1129
        """
1130
        if not self.is_locked():
1131
            raise AssertionError()
1132
        vf = self.revisions
1133
        if revisions_iterator is None:
1134
            revisions_iterator = self._iter_revisions(None)
1135
        for revid, revision in revisions_iterator:
1136
            if revision is None:
1137
                pass
1138
            parent_map = vf.get_parent_map([(revid,)])
1139
            parents_according_to_index = tuple(parent[-1] for parent in
1140
                parent_map[(revid,)])
1141
            parents_according_to_revision = tuple(revision.parent_ids)
1142
            if parents_according_to_index != parents_according_to_revision:
1143
                yield (revid, parents_according_to_index,
1144
                    parents_according_to_revision)
1145
1146
    def _check_for_inconsistent_revision_parents(self):
1147
        inconsistencies = list(self._find_inconsistent_revision_parents())
1148
        if inconsistencies:
1149
            raise errors.BzrCheckError(
1150
                "Revision index has inconsistent parents.")
1151
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1152
5757.2.1 by Jelmer Vernooij
Don't have CHK stream source depend on knit pack stream source.
1153
class GroupCHKStreamSource(StreamSource):
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1154
    """Used when both the source and target repo are GroupCHK repos."""
1155
1156
    def __init__(self, from_repository, to_format):
1157
        """Create a StreamSource streaming from from_repository."""
1158
        super(GroupCHKStreamSource, self).__init__(from_repository, to_format)
1159
        self._revision_keys = None
1160
        self._text_keys = None
4634.20.1 by Robert Collins
Fix bug 402652 by recompressing all texts that are streamed - slightly slower at fetch, substantially faster and more compact at read.
1161
        self._text_fetch_order = 'groupcompress'
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1162
        self._chk_id_roots = None
1163
        self._chk_p_id_roots = None
1164
4392.2.2 by John Arbash Meinel
Add tests that ensure we can fetch branches with ghosts in their ancestry.
1165
    def _get_inventory_stream(self, inventory_keys, allow_absent=False):
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1166
        """Get a stream of inventory texts.
1167
1168
        When this function returns, self._chk_id_roots and self._chk_p_id_roots
1169
        should be populated.
1170
        """
1171
        self._chk_id_roots = []
1172
        self._chk_p_id_roots = []
1173
        def _filtered_inv_stream():
1174
            id_roots_set = set()
1175
            p_id_roots_set = set()
1176
            source_vf = self.from_repository.inventories
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
1177
            stream = source_vf.get_record_stream(inventory_keys,
4634.20.1 by Robert Collins
Fix bug 402652 by recompressing all texts that are streamed - slightly slower at fetch, substantially faster and more compact at read.
1178
                                                 'groupcompress', True)
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1179
            for record in stream:
4392.2.2 by John Arbash Meinel
Add tests that ensure we can fetch branches with ghosts in their ancestry.
1180
                if record.storage_kind == 'absent':
1181
                    if allow_absent:
1182
                        continue
1183
                    else:
1184
                        raise errors.NoSuchRevision(self, record.key)
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1185
                bytes = record.get_bytes_as('fulltext')
1186
                chk_inv = inventory.CHKInventory.deserialise(None, bytes,
1187
                                                             record.key)
1188
                key = chk_inv.id_to_entry.key()
1189
                if key not in id_roots_set:
1190
                    self._chk_id_roots.append(key)
1191
                    id_roots_set.add(key)
1192
                p_id_map = chk_inv.parent_id_basename_to_file_id
1193
                if p_id_map is None:
1194
                    raise AssertionError('Parent id -> file_id map not set')
1195
                key = p_id_map.key()
1196
                if key not in p_id_roots_set:
1197
                    p_id_roots_set.add(key)
1198
                    self._chk_p_id_roots.append(key)
1199
                yield record
1200
            # We have finished processing all of the inventory records, we
1201
            # don't need these sets anymore
1202
            id_roots_set.clear()
1203
            p_id_roots_set.clear()
1204
        return ('inventories', _filtered_inv_stream())
1205
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1206
    def _get_filtered_chk_streams(self, excluded_revision_keys):
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1207
        self._text_keys = set()
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1208
        excluded_revision_keys.discard(_mod_revision.NULL_REVISION)
1209
        if not excluded_revision_keys:
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1210
            uninteresting_root_keys = set()
1211
            uninteresting_pid_root_keys = set()
1212
        else:
4343.3.26 by John Arbash Meinel
Handle get_stream when a parent is actually a ghost.
1213
            # filter out any excluded revisions whose inventories are not
1214
            # actually present
1215
            # TODO: Update Repository.iter_inventories() to add
1216
            #       ignore_missing=True
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1217
            present_keys = self.from_repository._find_present_inventory_keys(
1218
                            excluded_revision_keys)
1219
            present_ids = [k[-1] for k in present_keys]
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1220
            uninteresting_root_keys = set()
1221
            uninteresting_pid_root_keys = set()
4343.3.26 by John Arbash Meinel
Handle get_stream when a parent is actually a ghost.
1222
            for inv in self.from_repository.iter_inventories(present_ids):
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1223
                uninteresting_root_keys.add(inv.id_to_entry.key())
1224
                uninteresting_pid_root_keys.add(
1225
                    inv.parent_id_basename_to_file_id.key())
1226
        chk_bytes = self.from_repository.chk_bytes
1227
        def _filter_id_to_entry():
4634.35.6 by Andrew Bennetts
Start reusing common logic for calculating text keys.
1228
            interesting_nodes = chk_map.iter_interesting_nodes(chk_bytes,
1229
                        self._chk_id_roots, uninteresting_root_keys)
1230
            for record in _filter_text_keys(interesting_nodes, self._text_keys,
5218.2.1 by John Arbash Meinel
Implement a compiled extension for parsing the text key out of a CHKInventory value.
1231
                    chk_map._bytes_to_text_key):
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1232
                if record is not None:
1233
                    yield record
4343.3.8 by John Arbash Meinel
Some cleanup passes.
1234
            # Consumed
1235
            self._chk_id_roots = None
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1236
        yield 'chk_bytes', _filter_id_to_entry()
1237
        def _get_parent_id_basename_to_file_id_pages():
1238
            for record, items in chk_map.iter_interesting_nodes(chk_bytes,
1239
                        self._chk_p_id_roots, uninteresting_pid_root_keys):
1240
                if record is not None:
1241
                    yield record
4343.3.8 by John Arbash Meinel
Some cleanup passes.
1242
            # Consumed
1243
            self._chk_p_id_roots = None
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1244
        yield 'chk_bytes', _get_parent_id_basename_to_file_id_pages()
1245
5757.2.1 by Jelmer Vernooij
Don't have CHK stream source depend on knit pack stream source.
1246
    def _get_text_stream(self):
1247
        # Note: We know we don't have to handle adding root keys, because both
1248
        # the source and target are the identical network name.
1249
        text_stream = self.from_repository.texts.get_record_stream(
1250
                        self._text_keys, self._text_fetch_order, False)
1251
        return ('texts', text_stream)
1252
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1253
    def get_stream(self, search):
5195.3.24 by Parth Malwankar
progress indicator for local branch.
1254
        def wrap_and_count(pb, rc, stream):
5195.3.27 by Parth Malwankar
code cleanup and comments.
1255
            """Yield records from stream while showing progress."""
5195.3.24 by Parth Malwankar
progress indicator for local branch.
1256
            count = 0
1257
            for record in stream:
1258
                if count == rc.STEP:
1259
                    rc.increment(count)
1260
                    pb.update('Estimate', rc.current, rc.max)
1261
                    count = 0
1262
                count += 1
1263
                yield record
1264
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1265
        revision_ids = search.get_keys()
5195.3.24 by Parth Malwankar
progress indicator for local branch.
1266
        pb = ui.ui_factory.nested_progress_bar()
1267
        rc = self._record_counter
1268
        self._record_counter.setup(len(revision_ids))
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1269
        for stream_info in self._fetch_revision_texts(revision_ids):
5195.3.24 by Parth Malwankar
progress indicator for local branch.
1270
            yield (stream_info[0],
1271
                wrap_and_count(pb, rc, stream_info[1]))
3735.42.1 by John Arbash Meinel
Create a GC => GC fetch code path.
1272
        self._revision_keys = [(rev_id,) for rev_id in revision_ids]
4343.3.12 by John Arbash Meinel
instead of trusting the Search, use a get_parent_map call.
1273
        # TODO: The keys to exclude might be part of the search recipe
1274
        # For now, exclude all parents that are at the edge of ancestry, for
1275
        # which we have inventories
4343.3.36 by John Arbash Meinel
Some review feedback from Andrew.
1276
        from_repo = self.from_repository
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1277
        parent_keys = from_repo._find_parent_keys_of_revisions(
1278
                        self._revision_keys)
5829.1.1 by Andrew Bennetts
Share _group_cache when using GroupCompressVersionedFiles.without_fallbacks, and move _find_parents_keys_of_revisions call to before we clear repo.revisions' cache.
1279
        self.from_repository.revisions.clear_cache()
1280
        self.from_repository.signatures.clear_cache()
5816.8.7 by Andrew Bennetts
Some tweaks to caching prompted by John's review.
1281
        # Clear the repo's get_parent_map cache too.
1282
        self.from_repository._unstacked_provider.disable_cache()
1283
        self.from_repository._unstacked_provider.enable_cache()
5829.1.1 by Andrew Bennetts
Share _group_cache when using GroupCompressVersionedFiles.without_fallbacks, and move _find_parents_keys_of_revisions call to before we clear repo.revisions' cache.
1284
        s = self._get_inventory_stream(self._revision_keys)
1285
        yield (s[0], wrap_and_count(pb, rc, s[1]))
1286
        self.from_repository.inventories.clear_cache()
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1287
        for stream_info in self._get_filtered_chk_streams(parent_keys):
5195.3.24 by Parth Malwankar
progress indicator for local branch.
1288
            yield (stream_info[0], wrap_and_count(pb, rc, stream_info[1]))
4744.2.5 by John Arbash Meinel
Change to a generic 'VersionedFiles.clear_cache()' api.
1289
        self.from_repository.chk_bytes.clear_cache()
5195.3.24 by Parth Malwankar
progress indicator for local branch.
1290
        s = self._get_text_stream()
1291
        yield (s[0], wrap_and_count(pb, rc, s[1]))
4744.2.5 by John Arbash Meinel
Change to a generic 'VersionedFiles.clear_cache()' api.
1292
        self.from_repository.texts.clear_cache()
5195.3.24 by Parth Malwankar
progress indicator for local branch.
1293
        pb.update('Done', rc.max, rc.max)
1294
        pb.finished()
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1295
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
1296
    def get_stream_for_missing_keys(self, missing_keys):
1297
        # missing keys can only occur when we are byte copying and not
1298
        # translating (because translation means we don't send
1299
        # unreconstructable deltas ever).
4343.3.8 by John Arbash Meinel
Some cleanup passes.
1300
        missing_inventory_keys = set()
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
1301
        for key in missing_keys:
4343.3.8 by John Arbash Meinel
Some cleanup passes.
1302
            if key[0] != 'inventories':
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
1303
                raise AssertionError('The only missing keys we should'
1304
                    ' be filling in are inventory keys, not %s'
4343.3.8 by John Arbash Meinel
Some cleanup passes.
1305
                    % (key[0],))
1306
            missing_inventory_keys.add(key[1:])
1307
        if self._chk_id_roots or self._chk_p_id_roots:
1308
            raise AssertionError('Cannot call get_stream_for_missing_keys'
4634.35.5 by Andrew Bennetts
Check for missing texts, too.
1309
                ' until all of get_stream() has been consumed.')
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
1310
        # Yield the inventory stream, so we can find the chk stream
4392.2.2 by John Arbash Meinel
Add tests that ensure we can fetch branches with ghosts in their ancestry.
1311
        # Some of the missing_keys will be missing because they are ghosts.
1312
        # As such, we can ignore them. The Sink is required to verify there are
1313
        # no unavailable texts when the ghost inventories are not filled in.
1314
        yield self._get_inventory_stream(missing_inventory_keys,
1315
                                         allow_absent=True)
4360.4.12 by John Arbash Meinel
Work out some issues with revision_ids vs revision_keys.
1316
        # We use the empty set for excluded_revision_keys, to make it clear
1317
        # that we want to transmit all referenced chk pages.
4343.3.4 by John Arbash Meinel
Custom implementation for GroupCHKStreamSource.get_stream_for_missing_keys.
1318
        for stream_info in self._get_filtered_chk_streams(set()):
1319
            yield stream_info
1320
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1321
4634.35.7 by Andrew Bennetts
Reuse a little more logic for calculating (un)interesting chk root keys.
1322
class _InterestingKeyInfo(object):
1323
    def __init__(self):
1324
        self.interesting_root_keys = set()
1325
        self.interesting_pid_root_keys = set()
1326
        self.uninteresting_root_keys = set()
1327
        self.uninteresting_pid_root_keys = set()
1328
1329
    def all_interesting(self):
1330
        return self.interesting_root_keys.union(self.interesting_pid_root_keys)
1331
1332
    def all_uninteresting(self):
1333
        return self.uninteresting_root_keys.union(
1334
            self.uninteresting_pid_root_keys)
1335
1336
    def all_keys(self):
1337
        return self.all_interesting().union(self.all_uninteresting())
1338
1339
1340
def _build_interesting_key_sets(repo, inventory_ids, parent_only_inv_ids):
1341
    result = _InterestingKeyInfo()
1342
    for inv in repo.iter_inventories(inventory_ids, 'unordered'):
1343
        root_key = inv.id_to_entry.key()
1344
        pid_root_key = inv.parent_id_basename_to_file_id.key()
1345
        if inv.revision_id in parent_only_inv_ids:
1346
            result.uninteresting_root_keys.add(root_key)
1347
            result.uninteresting_pid_root_keys.add(pid_root_key)
1348
        else:
1349
            result.interesting_root_keys.add(root_key)
1350
            result.interesting_pid_root_keys.add(pid_root_key)
1351
    return result
1352
1353
5218.2.1 by John Arbash Meinel
Implement a compiled extension for parsing the text key out of a CHKInventory value.
1354
def _filter_text_keys(interesting_nodes_iterable, text_keys, bytes_to_text_key):
4634.35.6 by Andrew Bennetts
Start reusing common logic for calculating text keys.
1355
    """Iterate the result of iter_interesting_nodes, yielding the records
1356
    and adding to text_keys.
1357
    """
5218.2.1 by John Arbash Meinel
Implement a compiled extension for parsing the text key out of a CHKInventory value.
1358
    text_keys_update = text_keys.update
4634.35.6 by Andrew Bennetts
Start reusing common logic for calculating text keys.
1359
    for record, items in interesting_nodes_iterable:
5218.2.1 by John Arbash Meinel
Implement a compiled extension for parsing the text key out of a CHKInventory value.
1360
        text_keys_update([bytes_to_text_key(b) for n,b in items])
4634.35.6 by Andrew Bennetts
Start reusing common logic for calculating text keys.
1361
        yield record
1362
1363
5546.1.1 by Andrew Bennetts
Remove RepositoryFormatCHK1 and RepositoryFormatCHK2.
1364
class RepositoryFormat2a(RepositoryFormatPack):
1365
    """A CHK repository that uses the bencode revision serializer."""
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1366
1367
    repository_class = CHKInventoryRepository
4343.3.1 by John Arbash Meinel
Set 'supports_external_lookups=True' for dev6 repositories.
1368
    supports_external_lookups = True
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1369
    supports_chks = True
1370
    _commit_builder_class = PackRootCommitBuilder
1371
    rich_root_data = True
5546.1.1 by Andrew Bennetts
Remove RepositoryFormatCHK1 and RepositoryFormatCHK2.
1372
    _serializer = chk_serializer.chk_bencode_serializer
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1373
    _commit_inv_deltas = True
1374
    # What index classes to use
1375
    index_builder_class = BTreeBuilder
1376
    index_class = BTreeGraphIndex
1377
    # Note: We cannot unpack a delta that references a text we haven't
1378
    # seen yet. There are 2 options, work in fulltexts, or require
1379
    # topological sorting. Using fulltexts is more optimal for local
1380
    # operations, because the source can be smart about extracting
1381
    # multiple in-a-row (and sharing strings). Topological is better
1382
    # for remote, because we access less data.
1383
    _fetch_order = 'unordered'
4265.1.2 by John Arbash Meinel
Set _fetch_uses_deltas back to False, so that conversions from arbitrary sources can still fetch 'unordered'
1384
    _fetch_uses_deltas = False # essentially ignored by the groupcompress code.
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1385
    fast_deltas = True
4431.3.7 by Jonathan Lange
Cherrypick bzr.dev 4470, resolving conflicts.
1386
    pack_compresses = True
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
1387
1388
    def _get_matching_bzrdir(self):
6472.2.1 by Jelmer Vernooij
Use bzrdir.controldir for generic access to control directories.
1389
        return controldir.format_registry.make_bzrdir('2a')
4428.2.1 by Martin Pool
Add 2a format
1390
1391
    def _ignore_setting_bzrdir(self, format):
1392
        pass
1393
1394
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
1395
6213.1.16 by Jelmer Vernooij
Feature support in repository.
1396
    @classmethod
1397
    def get_format_string(cls):
4428.2.1 by Martin Pool
Add 2a format
1398
        return ('Bazaar repository format 2a (needs bzr 1.16 or later)\n')
4634.28.1 by John Arbash Meinel
Update format description for --2a, it is no longer a 'development format'
1399
1400
    def get_format_description(self):
1401
        """See RepositoryFormat.get_format_description()."""
1402
        return ("Repository format 2a - rich roots, group compression"
1403
            " and chk inventories")
5389.1.1 by Jelmer Vernooij
Add development8-subtree.
1404
1405
1406
class RepositoryFormat2aSubtree(RepositoryFormat2a):
1407
    """A 2a repository format that supports nested trees.
1408
1409
    """
1410
1411
    def _get_matching_bzrdir(self):
6472.2.1 by Jelmer Vernooij
Use bzrdir.controldir for generic access to control directories.
1412
        return controldir.format_registry.make_bzrdir('development-subtree')
5389.1.1 by Jelmer Vernooij
Add development8-subtree.
1413
1414
    def _ignore_setting_bzrdir(self, format):
1415
        pass
1416
1417
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
1418
6213.1.16 by Jelmer Vernooij
Feature support in repository.
1419
    @classmethod
1420
    def get_format_string(cls):
5389.1.1 by Jelmer Vernooij
Add development8-subtree.
1421
        return ('Bazaar development format 8\n')
1422
1423
    def get_format_description(self):
1424
        """See RepositoryFormat.get_format_description()."""
1425
        return ("Development repository format 8 - nested trees, "
1426
                "group compression and chk inventories")
1427
1428
    experimental = True
1429
    supports_tree_reference = True