~bzr-pqm/bzr/bzr.dev

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