/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5050.70.1 by Martin Pool
Add failing test for bug 715000
1
# Copyright (C) 2008-2011 Canonical Ltd
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
2
#
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
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.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
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.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
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.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
16
17
"""Core compression logic for compressing streams of related files."""
18
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
19
import time
0.17.5 by Robert Collins
nograph tests completely passing.
20
import zlib
0.17.44 by John Arbash Meinel
Use the bit field to allow both lzma groups and zlib groups.
21
try:
22
    import pylzma
23
except ImportError:
24
    pylzma = None
0.17.5 by Robert Collins
nograph tests completely passing.
25
5757.8.2 by Jelmer Vernooij
Avoid annotate import during 'bzr st'.
26
from bzrlib.lazy_import import lazy_import
27
lazy_import(globals(), """
0.17.4 by Robert Collins
Annotate.
28
from bzrlib import (
29
    annotate,
0.17.5 by Robert Collins
nograph tests completely passing.
30
    debug,
31
    errors,
0.17.4 by Robert Collins
Annotate.
32
    graph as _mod_graph,
0.20.2 by John Arbash Meinel
Teach groupcompress about 'chunked' encoding
33
    osutils,
0.17.4 by Robert Collins
Annotate.
34
    pack,
4789.28.3 by John Arbash Meinel
Add a static_tuple.as_tuples() helper.
35
    static_tuple,
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
36
    trace,
5757.8.2 by Jelmer Vernooij
Avoid annotate import during 'bzr st'.
37
    tsort,
0.17.4 by Robert Collins
Annotate.
38
    )
5757.8.7 by Jelmer Vernooij
Merge moving of _DirectPackAccess.
39
40
from bzrlib.repofmt import pack_repo
5757.8.2 by Jelmer Vernooij
Avoid annotate import during 'bzr st'.
41
""")
42
0.17.21 by Robert Collins
Update groupcompress to bzrlib 1.10.
43
from bzrlib.btree_index import BTreeBuilder
0.17.24 by Robert Collins
Add a group cache to decompression, 5 times faster than knit at decompression when accessing everything in a group.
44
from bzrlib.lru_cache import LRUSizeCache
0.17.2 by Robert Collins
Core proof of concept working.
45
from bzrlib.versionedfile import (
5757.8.1 by Jelmer Vernooij
Avoid bzrlib.knit imports when using groupcompress repositories.
46
    _KeyRefs,
0.17.5 by Robert Collins
nograph tests completely passing.
47
    adapter_registry,
48
    AbsentContentFactory,
0.20.5 by John Arbash Meinel
Finish the Fulltext => Chunked conversions so that we work in the more-efficient Chunks.
49
    ChunkedContentFactory,
0.17.2 by Robert Collins
Core proof of concept working.
50
    FulltextContentFactory,
51
    VersionedFiles,
52
    )
53
4634.3.17 by Andrew Bennetts
Make BATCH_SIZE a global.
54
# Minimum number of uncompressed bytes to try fetch at once when retrieving
55
# groupcompress blocks.
56
BATCH_SIZE = 2**16
57
0.17.44 by John Arbash Meinel
Use the bit field to allow both lzma groups and zlib groups.
58
_USE_LZMA = False and (pylzma is not None)
0.17.2 by Robert Collins
Core proof of concept working.
59
3735.2.162 by John Arbash Meinel
Change GroupCompressor.compress() to return the start_point.
60
# osutils.sha_string('')
61
_null_sha1 = 'da39a3ee5e6b4b0d3255bfef95601890afd80709'
62
0.20.11 by John Arbash Meinel
start experimenting with gc-optimal ordering.
63
def sort_gc_optimal(parent_map):
3735.31.14 by John Arbash Meinel
Change the gc-optimal to 'groupcompress'
64
    """Sort and group the keys in parent_map into groupcompress order.
0.20.11 by John Arbash Meinel
start experimenting with gc-optimal ordering.
65
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
66
    groupcompress is defined (currently) as reverse-topological order, grouped
67
    by the key prefix.
0.20.11 by John Arbash Meinel
start experimenting with gc-optimal ordering.
68
69
    :return: A sorted-list of keys
70
    """
3735.31.14 by John Arbash Meinel
Change the gc-optimal to 'groupcompress'
71
    # groupcompress ordering is approximately reverse topological,
0.20.11 by John Arbash Meinel
start experimenting with gc-optimal ordering.
72
    # properly grouped by file-id.
0.20.23 by John Arbash Meinel
Add a progress indicator for chk pages.
73
    per_prefix_map = {}
4593.5.43 by John Arbash Meinel
The api for topo_sort() was to allow a list of (key, value)
74
    for key, value in parent_map.iteritems():
0.20.11 by John Arbash Meinel
start experimenting with gc-optimal ordering.
75
        if isinstance(key, str) or len(key) == 1:
0.20.23 by John Arbash Meinel
Add a progress indicator for chk pages.
76
            prefix = ''
0.20.11 by John Arbash Meinel
start experimenting with gc-optimal ordering.
77
        else:
0.20.23 by John Arbash Meinel
Add a progress indicator for chk pages.
78
            prefix = key[0]
79
        try:
4593.5.43 by John Arbash Meinel
The api for topo_sort() was to allow a list of (key, value)
80
            per_prefix_map[prefix][key] = value
0.20.23 by John Arbash Meinel
Add a progress indicator for chk pages.
81
        except KeyError:
4593.5.43 by John Arbash Meinel
The api for topo_sort() was to allow a list of (key, value)
82
            per_prefix_map[prefix] = {key: value}
0.20.11 by John Arbash Meinel
start experimenting with gc-optimal ordering.
83
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
84
    present_keys = []
0.20.11 by John Arbash Meinel
start experimenting with gc-optimal ordering.
85
    for prefix in sorted(per_prefix_map):
5757.8.2 by Jelmer Vernooij
Avoid annotate import during 'bzr st'.
86
        present_keys.extend(reversed(tsort.topo_sort(per_prefix_map[prefix])))
0.20.11 by John Arbash Meinel
start experimenting with gc-optimal ordering.
87
    return present_keys
88
89
3735.32.9 by John Arbash Meinel
Use a 32kB extension, since that is the max window size for zlib.
90
# The max zlib window size is 32kB, so if we set 'max_size' output of the
91
# decompressor to the requested bytes + 32kB, then we should guarantee
92
# num_bytes coming out.
93
_ZLIB_DECOMP_WINDOW = 32*1024
0.25.2 by John Arbash Meinel
First cut at meta-info as text form.
94
95
class GroupCompressBlock(object):
96
    """An object which maintains the internal structure of the compressed data.
97
98
    This tracks the meta info (start of text, length, type, etc.)
99
    """
100
0.25.5 by John Arbash Meinel
Now using a zlib compressed format.
101
    # Group Compress Block v1 Zlib
102
    GCB_HEADER = 'gcb1z\n'
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
103
    # Group Compress Block v1 Lzma
0.17.44 by John Arbash Meinel
Use the bit field to allow both lzma groups and zlib groups.
104
    GCB_LZ_HEADER = 'gcb1l\n'
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
105
    GCB_KNOWN_HEADERS = (GCB_HEADER, GCB_LZ_HEADER)
0.25.2 by John Arbash Meinel
First cut at meta-info as text form.
106
107
    def __init__(self):
108
        # map by key? or just order in file?
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
109
        self._compressor_name = None
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
110
        self._z_content_chunks = None
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
111
        self._z_content_decompressor = None
3735.32.5 by John Arbash Meinel
Change the parsing code to start out just holding the compressed bytes.
112
        self._z_content_length = None
113
        self._content_length = None
0.25.6 by John Arbash Meinel
(tests broken) implement the basic ability to have a separate header
114
        self._content = None
4469.1.1 by John Arbash Meinel
Add a set_content_chunked member to GroupCompressBlock.
115
        self._content_chunks = None
3735.32.5 by John Arbash Meinel
Change the parsing code to start out just holding the compressed bytes.
116
117
    def __len__(self):
3735.38.4 by John Arbash Meinel
Another disk format change.
118
        # This is the maximum number of bytes this object will reference if
119
        # everything is decompressed. However, if we decompress less than
120
        # everything... (this would cause some problems for LRUSizeCache)
121
        return self._content_length + self._z_content_length
0.17.48 by John Arbash Meinel
if _NO_LABELS is set, don't bother parsing the mini header.
122
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
123
    def _ensure_content(self, num_bytes=None):
124
        """Make sure that content has been expanded enough.
125
126
        :param num_bytes: Ensure that we have extracted at least num_bytes of
127
            content. If None, consume everything
128
        """
4744.2.3 by John Arbash Meinel
change the GroupcompressBlock code a bit.
129
        if self._content_length is None:
130
            raise AssertionError('self._content_length should never be None')
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
131
        if num_bytes is None:
132
            num_bytes = self._content_length
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
133
        elif (self._content_length is not None
134
              and num_bytes > self._content_length):
135
            raise AssertionError(
136
                'requested num_bytes (%d) > content length (%d)'
137
                % (num_bytes, self._content_length))
138
        # Expand the content if required
3735.32.6 by John Arbash Meinel
A bit of reworking changes things so content is expanded at extract() time.
139
        if self._content is None:
4469.1.1 by John Arbash Meinel
Add a set_content_chunked member to GroupCompressBlock.
140
            if self._content_chunks is not None:
141
                self._content = ''.join(self._content_chunks)
142
                self._content_chunks = None
143
        if self._content is None:
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
144
            # We join self._z_content_chunks here, because if we are
145
            # decompressing, then it is *very* likely that we have a single
146
            # chunk
147
            if self._z_content_chunks is None:
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
148
                raise AssertionError('No content to decompress')
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
149
            z_content = ''.join(self._z_content_chunks)
150
            if z_content == '':
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
151
                self._content = ''
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
152
            elif self._compressor_name == 'lzma':
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
153
                # We don't do partial lzma decomp yet
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
154
                self._content = pylzma.decompress(z_content)
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
155
            elif self._compressor_name == 'zlib':
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
156
                # Start a zlib decompressor
4744.2.3 by John Arbash Meinel
change the GroupcompressBlock code a bit.
157
                if num_bytes * 4 > self._content_length * 3:
158
                    # If we are requesting more that 3/4ths of the content,
159
                    # just extract the whole thing in a single pass
160
                    num_bytes = self._content_length
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
161
                    self._content = zlib.decompress(z_content)
3735.32.27 by John Arbash Meinel
Have _LazyGroupContentManager pre-extract everything it holds.
162
                else:
163
                    self._z_content_decompressor = zlib.decompressobj()
164
                    # Seed the decompressor with the uncompressed bytes, so
165
                    # that the rest of the code is simplified
166
                    self._content = self._z_content_decompressor.decompress(
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
167
                        z_content, num_bytes + _ZLIB_DECOMP_WINDOW)
4744.2.3 by John Arbash Meinel
change the GroupcompressBlock code a bit.
168
                    if not self._z_content_decompressor.unconsumed_tail:
169
                        self._z_content_decompressor = None
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
170
            else:
3735.2.182 by Matt Nordhoff
Improve an assertion message slightly, and fix typos in 2 others
171
                raise AssertionError('Unknown compressor: %r'
3735.2.183 by John Arbash Meinel
Fix the compressor name.
172
                                     % self._compressor_name)
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
173
        # Any bytes remaining to be decompressed will be in the decompressors
174
        # 'unconsumed_tail'
175
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
176
        # Do we have enough bytes already?
4744.2.3 by John Arbash Meinel
change the GroupcompressBlock code a bit.
177
        if len(self._content) >= num_bytes:
3735.32.27 by John Arbash Meinel
Have _LazyGroupContentManager pre-extract everything it holds.
178
            return
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
179
        # If we got this far, and don't have a decompressor, something is wrong
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
180
        if self._z_content_decompressor is None:
181
            raise AssertionError(
3735.2.182 by Matt Nordhoff
Improve an assertion message slightly, and fix typos in 2 others
182
                'No decompressor to decompress %d bytes' % num_bytes)
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
183
        remaining_decomp = self._z_content_decompressor.unconsumed_tail
4744.2.3 by John Arbash Meinel
change the GroupcompressBlock code a bit.
184
        if not remaining_decomp:
185
            raise AssertionError('Nothing left to decompress')
186
        needed_bytes = num_bytes - len(self._content)
187
        # We always set max_size to 32kB over the minimum needed, so that
188
        # zlib will give us as much as we really want.
189
        # TODO: If this isn't good enough, we could make a loop here,
190
        #       that keeps expanding the request until we get enough
191
        self._content += self._z_content_decompressor.decompress(
192
            remaining_decomp, needed_bytes + _ZLIB_DECOMP_WINDOW)
193
        if len(self._content) < num_bytes:
194
            raise AssertionError('%d bytes wanted, only %d available'
195
                                 % (num_bytes, len(self._content)))
196
        if not self._z_content_decompressor.unconsumed_tail:
197
            # The stream is finished
198
            self._z_content_decompressor = None
3735.32.6 by John Arbash Meinel
A bit of reworking changes things so content is expanded at extract() time.
199
3735.38.4 by John Arbash Meinel
Another disk format change.
200
    def _parse_bytes(self, bytes, pos):
3735.32.5 by John Arbash Meinel
Change the parsing code to start out just holding the compressed bytes.
201
        """Read the various lengths from the header.
202
203
        This also populates the various 'compressed' buffers.
204
205
        :return: The position in bytes just after the last newline
206
        """
3735.38.4 by John Arbash Meinel
Another disk format change.
207
        # At present, we have 2 integers for the compressed and uncompressed
208
        # content. In base10 (ascii) 14 bytes can represent > 1TB, so to avoid
209
        # checking too far, cap the search to 14 bytes.
210
        pos2 = bytes.index('\n', pos, pos + 14)
211
        self._z_content_length = int(bytes[pos:pos2])
212
        pos = pos2 + 1
213
        pos2 = bytes.index('\n', pos, pos + 14)
214
        self._content_length = int(bytes[pos:pos2])
215
        pos = pos2 + 1
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
216
        if len(bytes) != (pos + self._z_content_length):
217
            # XXX: Define some GCCorrupt error ?
218
            raise AssertionError('Invalid bytes: (%d) != %d + %d' %
219
                                 (len(bytes), pos, self._z_content_length))
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
220
        self._z_content_chunks = (bytes[pos:],)
221
222
    @property
223
    def _z_content(self):
5439.2.2 by John Arbash Meinel
Smal tweaks from reviewer feedback.
224
        """Return z_content_chunks as a simple string.
225
226
        Meant only to be used by the test suite.
227
        """
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
228
        if self._z_content_chunks is not None:
229
            return ''.join(self._z_content_chunks)
230
        return None
3735.32.5 by John Arbash Meinel
Change the parsing code to start out just holding the compressed bytes.
231
0.25.2 by John Arbash Meinel
First cut at meta-info as text form.
232
    @classmethod
233
    def from_bytes(cls, bytes):
234
        out = cls()
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
235
        if bytes[:6] not in cls.GCB_KNOWN_HEADERS:
236
            raise ValueError('bytes did not start with any of %r'
237
                             % (cls.GCB_KNOWN_HEADERS,))
238
        # XXX: why not testing the whole header ?
0.17.44 by John Arbash Meinel
Use the bit field to allow both lzma groups and zlib groups.
239
        if bytes[4] == 'z':
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
240
            out._compressor_name = 'zlib'
0.17.45 by John Arbash Meinel
Just make sure we have the right decompressor
241
        elif bytes[4] == 'l':
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
242
            out._compressor_name = 'lzma'
0.17.45 by John Arbash Meinel
Just make sure we have the right decompressor
243
        else:
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
244
            raise ValueError('unknown compressor: %r' % (bytes,))
3735.38.4 by John Arbash Meinel
Another disk format change.
245
        out._parse_bytes(bytes, 6)
0.25.2 by John Arbash Meinel
First cut at meta-info as text form.
246
        return out
247
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
248
    def extract(self, key, start, end, sha1=None):
0.25.2 by John Arbash Meinel
First cut at meta-info as text form.
249
        """Extract the text for a specific key.
250
251
        :param key: The label used for this content
252
        :param sha1: TODO (should we validate only when sha1 is supplied?)
253
        :return: The bytes for the content
254
        """
3735.34.1 by John Arbash Meinel
Some testing to see if we can decrease the peak memory consumption a bit.
255
        if start == end == 0:
3735.2.158 by John Arbash Meinel
Remove support for passing None for end in GroupCompressBlock.extract.
256
            return ''
257
        self._ensure_content(end)
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
258
        # The bytes are 'f' or 'd' for the type, then a variable-length
259
        # base128 integer for the content size, then the actual content
3735.32.15 by John Arbash Meinel
Change the GroupCompressBlock code to allow not recording 'end'.
260
        # We know that the variable-length integer won't be longer than 5
261
        # bytes (it takes 5 bytes to encode 2^32)
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
262
        c = self._content[start]
263
        if c == 'f':
264
            type = 'fulltext'
0.17.36 by John Arbash Meinel
Adding a mini-len to the delta/fulltext bytes
265
        else:
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
266
            if c != 'd':
267
                raise ValueError('Unknown content control code: %s'
268
                                 % (c,))
269
            type = 'delta'
3735.32.15 by John Arbash Meinel
Change the GroupCompressBlock code to allow not recording 'end'.
270
        content_len, len_len = decode_base128_int(
271
                            self._content[start + 1:start + 6])
272
        content_start = start + 1 + len_len
3735.2.158 by John Arbash Meinel
Remove support for passing None for end in GroupCompressBlock.extract.
273
        if end != content_start + content_len:
274
            raise ValueError('end != len according to field header'
275
                ' %s != %s' % (end, content_start + content_len))
0.17.36 by John Arbash Meinel
Adding a mini-len to the delta/fulltext bytes
276
        if c == 'f':
3735.40.19 by John Arbash Meinel
Implement apply_delta_to_source which doesn't have to malloc another string.
277
            bytes = self._content[content_start:end]
0.17.36 by John Arbash Meinel
Adding a mini-len to the delta/fulltext bytes
278
        elif c == 'd':
3735.40.19 by John Arbash Meinel
Implement apply_delta_to_source which doesn't have to malloc another string.
279
            bytes = apply_delta_to_source(self._content, content_start, end)
3735.2.158 by John Arbash Meinel
Remove support for passing None for end in GroupCompressBlock.extract.
280
        return bytes
0.25.2 by John Arbash Meinel
First cut at meta-info as text form.
281
4469.1.2 by John Arbash Meinel
The only caller already knows the content length, so make the api such that
282
    def set_chunked_content(self, content_chunks, length):
4469.1.1 by John Arbash Meinel
Add a set_content_chunked member to GroupCompressBlock.
283
        """Set the content of this block to the given chunks."""
4469.1.3 by John Arbash Meinel
Notes on why we do it the way we do.
284
        # If we have lots of short lines, it is may be more efficient to join
285
        # the content ahead of time. If the content is <10MiB, we don't really
286
        # care about the extra memory consumption, so we can just pack it and
287
        # be done. However, timing showed 18s => 17.9s for repacking 1k revs of
288
        # mysql, which is below the noise margin
4469.1.2 by John Arbash Meinel
The only caller already knows the content length, so make the api such that
289
        self._content_length = length
4469.1.1 by John Arbash Meinel
Add a set_content_chunked member to GroupCompressBlock.
290
        self._content_chunks = content_chunks
4469.1.2 by John Arbash Meinel
The only caller already knows the content length, so make the api such that
291
        self._content = None
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
292
        self._z_content_chunks = None
4469.1.1 by John Arbash Meinel
Add a set_content_chunked member to GroupCompressBlock.
293
3735.32.17 by John Arbash Meinel
We now round-trip the wire_bytes.
294
    def set_content(self, content):
295
        """Set the content of this block."""
296
        self._content_length = len(content)
297
        self._content = content
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
298
        self._z_content_chunks = None
3735.32.17 by John Arbash Meinel
We now round-trip the wire_bytes.
299
4469.1.1 by John Arbash Meinel
Add a set_content_chunked member to GroupCompressBlock.
300
    def _create_z_content_using_lzma(self):
301
        if self._content_chunks is not None:
302
            self._content = ''.join(self._content_chunks)
303
            self._content_chunks = None
304
        if self._content is None:
305
            raise AssertionError('Nothing to compress')
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
306
        z_content = pylzma.compress(self._content)
307
        self._z_content_chunks = (z_content,)
308
        self._z_content_length = len(z_content)
4469.1.1 by John Arbash Meinel
Add a set_content_chunked member to GroupCompressBlock.
309
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
310
    def _create_z_content_from_chunks(self, chunks):
4469.1.1 by John Arbash Meinel
Add a set_content_chunked member to GroupCompressBlock.
311
        compressor = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION)
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
312
        # Peak in this point is 1 fulltext, 1 compressed text, + zlib overhead
313
        # (measured peak is maybe 30MB over the above...)
314
        compressed_chunks = map(compressor.compress, chunks)
4469.1.1 by John Arbash Meinel
Add a set_content_chunked member to GroupCompressBlock.
315
        compressed_chunks.append(compressor.flush())
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
316
        # Ignore empty chunks
317
        self._z_content_chunks = [c for c in compressed_chunks if c]
318
        self._z_content_length = sum(map(len, self._z_content_chunks))
4469.1.1 by John Arbash Meinel
Add a set_content_chunked member to GroupCompressBlock.
319
320
    def _create_z_content(self):
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
321
        if self._z_content_chunks is not None:
4469.1.1 by John Arbash Meinel
Add a set_content_chunked member to GroupCompressBlock.
322
            return
323
        if _USE_LZMA:
324
            self._create_z_content_using_lzma()
325
            return
326
        if self._content_chunks is not None:
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
327
            chunks = self._content_chunks
328
        else:
329
            chunks = (self._content,)
330
        self._create_z_content_from_chunks(chunks)
4469.1.1 by John Arbash Meinel
Add a set_content_chunked member to GroupCompressBlock.
331
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
332
    def to_chunks(self):
333
        """Create the byte stream as a series of 'chunks'"""
4469.1.1 by John Arbash Meinel
Add a set_content_chunked member to GroupCompressBlock.
334
        self._create_z_content()
0.17.46 by John Arbash Meinel
Set the proper header when using/not using lzma
335
        if _USE_LZMA:
336
            header = self.GCB_LZ_HEADER
337
        else:
338
            header = self.GCB_HEADER
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
339
        chunks = ['%s%d\n%d\n'
340
                  % (header, self._z_content_length, self._content_length),
0.25.7 by John Arbash Meinel
Have the GroupCompressBlock decide how to compress the header and content.
341
                 ]
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
342
        chunks.extend(self._z_content_chunks)
343
        total_len = sum(map(len, chunks))
344
        return total_len, chunks
345
346
    def to_bytes(self):
347
        """Encode the information into a byte stream."""
348
        total_len, chunks = self.to_chunks()
0.25.2 by John Arbash Meinel
First cut at meta-info as text form.
349
        return ''.join(chunks)
350
4300.1.1 by John Arbash Meinel
Add the ability to convert a gc block into 'human readable' form.
351
    def _dump(self, include_text=False):
352
        """Take this block, and spit out a human-readable structure.
353
354
        :param include_text: Inserts also include text bits, chose whether you
355
            want this displayed in the dump or not.
356
        :return: A dump of the given block. The layout is something like:
357
            [('f', length), ('d', delta_length, text_length, [delta_info])]
358
            delta_info := [('i', num_bytes, text), ('c', offset, num_bytes),
359
            ...]
360
        """
361
        self._ensure_content()
362
        result = []
363
        pos = 0
364
        while pos < self._content_length:
365
            kind = self._content[pos]
366
            pos += 1
367
            if kind not in ('f', 'd'):
368
                raise ValueError('invalid kind character: %r' % (kind,))
369
            content_len, len_len = decode_base128_int(
370
                                self._content[pos:pos + 5])
371
            pos += len_len
372
            if content_len + pos > self._content_length:
373
                raise ValueError('invalid content_len %d for record @ pos %d'
374
                                 % (content_len, pos - len_len - 1))
375
            if kind == 'f': # Fulltext
4398.5.6 by John Arbash Meinel
A bit more debugging information from gcblock._dump(True)
376
                if include_text:
377
                    text = self._content[pos:pos+content_len]
378
                    result.append(('f', content_len, text))
379
                else:
380
                    result.append(('f', content_len))
4300.1.1 by John Arbash Meinel
Add the ability to convert a gc block into 'human readable' form.
381
            elif kind == 'd': # Delta
382
                delta_content = self._content[pos:pos+content_len]
383
                delta_info = []
384
                # The first entry in a delta is the decompressed length
385
                decomp_len, delta_pos = decode_base128_int(delta_content)
386
                result.append(('d', content_len, decomp_len, delta_info))
387
                measured_len = 0
388
                while delta_pos < content_len:
389
                    c = ord(delta_content[delta_pos])
390
                    delta_pos += 1
391
                    if c & 0x80: # Copy
392
                        (offset, length,
393
                         delta_pos) = decode_copy_instruction(delta_content, c,
394
                                                              delta_pos)
4398.5.6 by John Arbash Meinel
A bit more debugging information from gcblock._dump(True)
395
                        if include_text:
396
                            text = self._content[offset:offset+length]
397
                            delta_info.append(('c', offset, length, text))
398
                        else:
399
                            delta_info.append(('c', offset, length))
4300.1.1 by John Arbash Meinel
Add the ability to convert a gc block into 'human readable' form.
400
                        measured_len += length
401
                    else: # Insert
402
                        if include_text:
403
                            txt = delta_content[delta_pos:delta_pos+c]
404
                        else:
405
                            txt = ''
406
                        delta_info.append(('i', c, txt))
407
                        measured_len += c
408
                        delta_pos += c
409
                if delta_pos != content_len:
410
                    raise ValueError('Delta consumed a bad number of bytes:'
411
                                     ' %d != %d' % (delta_pos, content_len))
412
                if measured_len != decomp_len:
413
                    raise ValueError('Delta claimed fulltext was %d bytes, but'
414
                                     ' extraction resulted in %d bytes'
415
                                     % (decomp_len, measured_len))
416
            pos += content_len
417
        return result
418
0.25.2 by John Arbash Meinel
First cut at meta-info as text form.
419
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
420
class _LazyGroupCompressFactory(object):
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
421
    """Yield content from a GroupCompressBlock on demand."""
422
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
423
    def __init__(self, key, parents, manager, start, end, first):
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
424
        """Create a _LazyGroupCompressFactory
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
425
426
        :param key: The key of just this record
427
        :param parents: The parents of this key (possibly None)
428
        :param gc_block: A GroupCompressBlock object
429
        :param start: Offset of the first byte for this record in the
430
            uncompressd content
431
        :param end: Offset of the byte just after the end of this record
432
            (ie, bytes = content[start:end])
433
        :param first: Is this the first Factory for the given block?
434
        """
435
        self.key = key
436
        self.parents = parents
437
        self.sha1 = None
3735.32.15 by John Arbash Meinel
Change the GroupCompressBlock code to allow not recording 'end'.
438
        # Note: This attribute coupled with Manager._factories creates a
439
        #       reference cycle. Perhaps we would rather use a weakref(), or
440
        #       find an appropriate time to release the ref. After the first
441
        #       get_bytes_as call? After Manager.get_record_stream() returns
442
        #       the object?
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
443
        self._manager = manager
3735.34.1 by John Arbash Meinel
Some testing to see if we can decrease the peak memory consumption a bit.
444
        self._bytes = None
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
445
        self.storage_kind = 'groupcompress-block'
446
        if not first:
447
            self.storage_kind = 'groupcompress-block-ref'
448
        self._first = first
449
        self._start = start
450
        self._end = end
451
3735.32.12 by John Arbash Meinel
Add groupcompress-block[-ref] as valid stream types.
452
    def __repr__(self):
453
        return '%s(%s, first=%s)' % (self.__class__.__name__,
454
            self.key, self._first)
455
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
456
    def get_bytes_as(self, storage_kind):
457
        if storage_kind == self.storage_kind:
458
            if self._first:
459
                # wire bytes, something...
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
460
                return self._manager._wire_bytes()
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
461
            else:
462
                return ''
463
        if storage_kind in ('fulltext', 'chunked'):
3735.34.1 by John Arbash Meinel
Some testing to see if we can decrease the peak memory consumption a bit.
464
            if self._bytes is None:
3735.34.3 by John Arbash Meinel
Cleanup, in preparation for merging to brisbane-core.
465
                # Grab and cache the raw bytes for this entry
466
                # and break the ref-cycle with _manager since we don't need it
467
                # anymore
3735.34.1 by John Arbash Meinel
Some testing to see if we can decrease the peak memory consumption a bit.
468
                self._manager._prepare_for_extract()
469
                block = self._manager._block
3735.34.2 by John Arbash Meinel
Merge brisbane-core tip, resolve differences.
470
                self._bytes = block.extract(self.key, self._start, self._end)
3735.37.5 by John Arbash Meinel
Restore the refcycle reduction code.
471
                # There are code paths that first extract as fulltext, and then
472
                # extract as storage_kind (smart fetch). So we don't break the
473
                # refcycle here, but instead in manager.get_record_stream()
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
474
            if storage_kind == 'fulltext':
3735.34.1 by John Arbash Meinel
Some testing to see if we can decrease the peak memory consumption a bit.
475
                return self._bytes
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
476
            else:
3735.34.1 by John Arbash Meinel
Some testing to see if we can decrease the peak memory consumption a bit.
477
                return [self._bytes]
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
478
        raise errors.UnavailableRepresentation(self.key, storage_kind,
3735.34.3 by John Arbash Meinel
Cleanup, in preparation for merging to brisbane-core.
479
                                               self.storage_kind)
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
480
481
3735.32.17 by John Arbash Meinel
We now round-trip the wire_bytes.
482
class _LazyGroupContentManager(object):
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
483
    """This manages a group of _LazyGroupCompressFactory objects."""
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
484
4665.3.7 by John Arbash Meinel
We needed a bit more data to actually get groups doing delta-compression.
485
    _max_cut_fraction = 0.75 # We allow a block to be trimmed to 75% of
486
                             # current size, and still be considered
487
                             # resuable
488
    _full_block_size = 4*1024*1024
489
    _full_mixed_block_size = 2*1024*1024
490
    _full_enough_block_size = 3*1024*1024 # size at which we won't repack
491
    _full_enough_mixed_block_size = 2*768*1024 # 1.5MB
492
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
493
    def __init__(self, block):
494
        self._block = block
495
        # We need to preserve the ordering
496
        self._factories = []
3735.32.27 by John Arbash Meinel
Have _LazyGroupContentManager pre-extract everything it holds.
497
        self._last_byte = 0
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
498
499
    def add_factory(self, key, parents, start, end):
500
        if not self._factories:
501
            first = True
502
        else:
503
            first = False
504
        # Note that this creates a reference cycle....
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
505
        factory = _LazyGroupCompressFactory(key, parents, self,
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
506
            start, end, first=first)
3735.36.13 by John Arbash Meinel
max() shows up under lsprof as more expensive than creating an object.
507
        # max() works here, but as a function call, doing a compare seems to be
508
        # significantly faster, timeit says 250ms for max() and 100ms for the
509
        # comparison
510
        if end > self._last_byte:
511
            self._last_byte = end
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
512
        self._factories.append(factory)
513
514
    def get_record_stream(self):
515
        """Get a record for all keys added so far."""
516
        for factory in self._factories:
517
            yield factory
3735.34.3 by John Arbash Meinel
Cleanup, in preparation for merging to brisbane-core.
518
            # Break the ref-cycle
3735.34.2 by John Arbash Meinel
Merge brisbane-core tip, resolve differences.
519
            factory._bytes = None
3735.37.5 by John Arbash Meinel
Restore the refcycle reduction code.
520
            factory._manager = None
3735.32.15 by John Arbash Meinel
Change the GroupCompressBlock code to allow not recording 'end'.
521
        # TODO: Consider setting self._factories = None after the above loop,
522
        #       as it will break the reference cycle
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
523
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
524
    def _trim_block(self, last_byte):
525
        """Create a new GroupCompressBlock, with just some of the content."""
526
        # None of the factories need to be adjusted, because the content is
527
        # located in an identical place. Just that some of the unreferenced
528
        # trailing bytes are stripped
529
        trace.mutter('stripping trailing bytes from groupcompress block'
530
                     ' %d => %d', self._block._content_length, last_byte)
531
        new_block = GroupCompressBlock()
532
        self._block._ensure_content(last_byte)
533
        new_block.set_content(self._block._content[:last_byte])
534
        self._block = new_block
535
536
    def _rebuild_block(self):
537
        """Create a new GroupCompressBlock with only the referenced texts."""
538
        compressor = GroupCompressor()
539
        tstart = time.time()
540
        old_length = self._block._content_length
3735.2.162 by John Arbash Meinel
Change GroupCompressor.compress() to return the start_point.
541
        end_point = 0
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
542
        for factory in self._factories:
543
            bytes = factory.get_bytes_as('fulltext')
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
544
            (found_sha1, start_point, end_point,
545
             type) = compressor.compress(factory.key, bytes, factory.sha1)
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
546
            # Now update this factory with the new offsets, etc
547
            factory.sha1 = found_sha1
3735.2.162 by John Arbash Meinel
Change GroupCompressor.compress() to return the start_point.
548
            factory._start = start_point
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
549
            factory._end = end_point
3735.2.162 by John Arbash Meinel
Change GroupCompressor.compress() to return the start_point.
550
        self._last_byte = end_point
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
551
        new_block = compressor.flush()
552
        # TODO: Should we check that new_block really *is* smaller than the old
553
        #       block? It seems hard to come up with a method that it would
554
        #       expand, since we do full compression again. Perhaps based on a
555
        #       request that ends up poorly ordered?
556
        delta = time.time() - tstart
557
        self._block = new_block
4641.4.2 by John Arbash Meinel
Use unordered fetches to avoid fragmentation (bug #402645)
558
        trace.mutter('creating new compressed block on-the-fly in %.3fs'
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
559
                     ' %d bytes => %d bytes', delta, old_length,
560
                     self._block._content_length)
561
3735.32.27 by John Arbash Meinel
Have _LazyGroupContentManager pre-extract everything it holds.
562
    def _prepare_for_extract(self):
563
        """A _LazyGroupCompressFactory is about to extract to fulltext."""
564
        # We expect that if one child is going to fulltext, all will be. This
565
        # helps prevent all of them from extracting a small amount at a time.
566
        # Which in itself isn't terribly expensive, but resizing 2MB 32kB at a
567
        # time (self._block._content) is a little expensive.
568
        self._block._ensure_content(self._last_byte)
569
4665.3.4 by John Arbash Meinel
Refactor the check_rebuild code a bit, so that we can potentially
570
    def _check_rebuild_action(self):
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
571
        """Check to see if our block should be repacked."""
572
        total_bytes_used = 0
573
        last_byte_used = 0
574
        for factory in self._factories:
575
            total_bytes_used += factory._end - factory._start
4665.3.4 by John Arbash Meinel
Refactor the check_rebuild code a bit, so that we can potentially
576
            if last_byte_used < factory._end:
577
                last_byte_used = factory._end
578
        # If we are using more than half of the bytes from the block, we have
579
        # nothing else to check
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
580
        if total_bytes_used * 2 >= self._block._content_length:
4665.3.5 by John Arbash Meinel
Work out a heuristic about when a block is well utilized
581
            return None, last_byte_used, total_bytes_used
4665.3.4 by John Arbash Meinel
Refactor the check_rebuild code a bit, so that we can potentially
582
        # We are using less than 50% of the content. Is the content we are
583
        # using at the beginning of the block? If so, we can just trim the
584
        # tail, rather than rebuilding from scratch.
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
585
        if total_bytes_used * 2 > last_byte_used:
4665.3.5 by John Arbash Meinel
Work out a heuristic about when a block is well utilized
586
            return 'trim', last_byte_used, total_bytes_used
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
587
588
        # We are using a small amount of the data, and it isn't just packed
589
        # nicely at the front, so rebuild the content.
590
        # Note: This would be *nicer* as a strip-data-from-group, rather than
591
        #       building it up again from scratch
592
        #       It might be reasonable to consider the fulltext sizes for
593
        #       different bits when deciding this, too. As you may have a small
594
        #       fulltext, and a trivial delta, and you are just trading around
595
        #       for another fulltext. If we do a simple 'prune' you may end up
596
        #       expanding many deltas into fulltexts, as well.
597
        #       If we build a cheap enough 'strip', then we could try a strip,
598
        #       if that expands the content, we then rebuild.
4665.3.5 by John Arbash Meinel
Work out a heuristic about when a block is well utilized
599
        return 'rebuild', last_byte_used, total_bytes_used
600
601
    def check_is_well_utilized(self):
602
        """Is the current block considered 'well utilized'?
603
4665.3.15 by Robert Collins
Review and tweak
604
        This heuristic asks if the current block considers itself to be a fully
605
        developed group, rather than just a loose collection of data.
4665.3.5 by John Arbash Meinel
Work out a heuristic about when a block is well utilized
606
        """
607
        if len(self._factories) == 1:
4665.3.15 by Robert Collins
Review and tweak
608
            # A block of length 1 could be improved by combining with other
609
            # groups - don't look deeper. Even larger than max size groups
610
            # could compress well with adjacent versions of the same thing.
4665.3.5 by John Arbash Meinel
Work out a heuristic about when a block is well utilized
611
            return False
612
        action, last_byte_used, total_bytes_used = self._check_rebuild_action()
4665.3.7 by John Arbash Meinel
We needed a bit more data to actually get groups doing delta-compression.
613
        block_size = self._block._content_length
614
        if total_bytes_used < block_size * self._max_cut_fraction:
615
            # This block wants to trim itself small enough that we want to
616
            # consider it under-utilized.
4665.3.5 by John Arbash Meinel
Work out a heuristic about when a block is well utilized
617
            return False
618
        # TODO: This code is meant to be the twin of _insert_record_stream's
619
        #       'start_new_block' logic. It would probably be better to factor
620
        #       out that logic into a shared location, so that it stays
621
        #       together better
4665.3.6 by John Arbash Meinel
Add some comments, etc to discussing the 'is this block full enough'
622
        # We currently assume a block is properly utilized whenever it is >75%
623
        # of the size of a 'full' block. In normal operation, a block is
624
        # considered full when it hits 4MB of same-file content. So any block
625
        # >3MB is 'full enough'.
626
        # The only time this isn't true is when a given block has large-object
627
        # content. (a single file >4MB, etc.)
628
        # Under these circumstances, we allow a block to grow to
629
        # 2 x largest_content.  Which means that if a given block had a large
630
        # object, it may actually be under-utilized. However, given that this
631
        # is 'pack-on-the-fly' it is probably reasonable to not repack large
4665.3.15 by Robert Collins
Review and tweak
632
        # content blobs on-the-fly. Note that because we return False for all
633
        # 1-item blobs, we will repack them; we may wish to reevaluate our
634
        # treatment of large object blobs in the future.
4665.3.7 by John Arbash Meinel
We needed a bit more data to actually get groups doing delta-compression.
635
        if block_size >= self._full_enough_block_size:
4665.3.5 by John Arbash Meinel
Work out a heuristic about when a block is well utilized
636
            return True
4665.3.6 by John Arbash Meinel
Add some comments, etc to discussing the 'is this block full enough'
637
        # If a block is <3MB, it still may be considered 'full' if it contains
638
        # mixed content. The current rule is 2MB of mixed content is considered
639
        # full. So check to see if this block contains mixed content, and
640
        # set the threshold appropriately.
4665.3.5 by John Arbash Meinel
Work out a heuristic about when a block is well utilized
641
        common_prefix = None
642
        for factory in self._factories:
643
            prefix = factory.key[:-1]
644
            if common_prefix is None:
645
                common_prefix = prefix
646
            elif prefix != common_prefix:
4665.3.6 by John Arbash Meinel
Add some comments, etc to discussing the 'is this block full enough'
647
                # Mixed content, check the size appropriately
4665.3.7 by John Arbash Meinel
We needed a bit more data to actually get groups doing delta-compression.
648
                if block_size >= self._full_enough_mixed_block_size:
4665.3.6 by John Arbash Meinel
Add some comments, etc to discussing the 'is this block full enough'
649
                    return True
4665.3.5 by John Arbash Meinel
Work out a heuristic about when a block is well utilized
650
                break
4665.3.6 by John Arbash Meinel
Add some comments, etc to discussing the 'is this block full enough'
651
        # The content failed both the mixed check and the single-content check
652
        # so obviously it is not fully utilized
4665.3.9 by John Arbash Meinel
Start doing some work to make sure that we call _check_rebuild_block
653
        # TODO: there is one other constraint that isn't being checked
654
        #       namely, that the entries in the block are in the appropriate
655
        #       order. For example, you could insert the entries in exactly
656
        #       reverse groupcompress order, and we would think that is ok.
657
        #       (all the right objects are in one group, and it is fully
658
        #       utilized, etc.) For now, we assume that case is rare,
659
        #       especially since we should always fetch in 'groupcompress'
660
        #       order.
4665.3.5 by John Arbash Meinel
Work out a heuristic about when a block is well utilized
661
        return False
4665.3.4 by John Arbash Meinel
Refactor the check_rebuild code a bit, so that we can potentially
662
663
    def _check_rebuild_block(self):
4665.3.5 by John Arbash Meinel
Work out a heuristic about when a block is well utilized
664
        action, last_byte_used, total_bytes_used = self._check_rebuild_action()
4665.3.4 by John Arbash Meinel
Refactor the check_rebuild code a bit, so that we can potentially
665
        if action is None:
666
            return
667
        if action == 'trim':
668
            self._trim_block(last_byte_used)
669
        elif action == 'rebuild':
670
            self._rebuild_block()
671
        else:
672
            raise ValueError('unknown rebuild action: %r' % (action,))
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
673
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
674
    def _wire_bytes(self):
675
        """Return a byte stream suitable for transmitting over the wire."""
3735.32.24 by John Arbash Meinel
_wire_bytes() now strips groups as necessary, as does _insert_record_stream
676
        self._check_rebuild_block()
3735.32.16 by John Arbash Meinel
We now have a general header for the GC block.
677
        # The outer block starts with:
678
        #   'groupcompress-block\n'
679
        #   <length of compressed key info>\n
680
        #   <length of uncompressed info>\n
681
        #   <length of gc block>\n
682
        #   <header bytes>
683
        #   <gc-block>
684
        lines = ['groupcompress-block\n']
685
        # The minimal info we need is the key, the start offset, and the
686
        # parents. The length and type are encoded in the record itself.
687
        # However, passing in the other bits makes it easier.  The list of
688
        # keys, and the start offset, the length
689
        # 1 line key
690
        # 1 line with parents, '' for ()
691
        # 1 line for start offset
692
        # 1 line for end byte
693
        header_lines = []
3735.32.15 by John Arbash Meinel
Change the GroupCompressBlock code to allow not recording 'end'.
694
        for factory in self._factories:
3735.32.16 by John Arbash Meinel
We now have a general header for the GC block.
695
            key_bytes = '\x00'.join(factory.key)
696
            parents = factory.parents
697
            if parents is None:
698
                parent_bytes = 'None:'
699
            else:
700
                parent_bytes = '\t'.join('\x00'.join(key) for key in parents)
701
            record_header = '%s\n%s\n%d\n%d\n' % (
702
                key_bytes, parent_bytes, factory._start, factory._end)
703
            header_lines.append(record_header)
3735.37.5 by John Arbash Meinel
Restore the refcycle reduction code.
704
            # TODO: Can we break the refcycle at this point and set
705
            #       factory._manager = None?
3735.32.16 by John Arbash Meinel
We now have a general header for the GC block.
706
        header_bytes = ''.join(header_lines)
707
        del header_lines
708
        header_bytes_len = len(header_bytes)
709
        z_header_bytes = zlib.compress(header_bytes)
710
        del header_bytes
711
        z_header_bytes_len = len(z_header_bytes)
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
712
        block_bytes_len, block_chunks = self._block.to_chunks()
3735.32.16 by John Arbash Meinel
We now have a general header for the GC block.
713
        lines.append('%d\n%d\n%d\n' % (z_header_bytes_len, header_bytes_len,
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
714
                                       block_bytes_len))
3735.32.16 by John Arbash Meinel
We now have a general header for the GC block.
715
        lines.append(z_header_bytes)
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
716
        lines.extend(block_chunks)
717
        del z_header_bytes, block_chunks
718
        # TODO: This is a point where we will double the memory consumption. To
719
        #       avoid this, we probably have to switch to a 'chunked' api
3735.32.16 by John Arbash Meinel
We now have a general header for the GC block.
720
        return ''.join(lines)
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
721
3735.32.17 by John Arbash Meinel
We now round-trip the wire_bytes.
722
    @classmethod
3735.32.18 by John Arbash Meinel
We now support generating a network stream.
723
    def from_bytes(cls, bytes):
3735.32.17 by John Arbash Meinel
We now round-trip the wire_bytes.
724
        # TODO: This does extra string copying, probably better to do it a
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
725
        #       different way. At a minimum this creates 2 copies of the
726
        #       compressed content
3735.32.17 by John Arbash Meinel
We now round-trip the wire_bytes.
727
        (storage_kind, z_header_len, header_len,
728
         block_len, rest) = bytes.split('\n', 4)
729
        del bytes
730
        if storage_kind != 'groupcompress-block':
731
            raise ValueError('Unknown storage kind: %s' % (storage_kind,))
732
        z_header_len = int(z_header_len)
733
        if len(rest) < z_header_len:
734
            raise ValueError('Compressed header len shorter than all bytes')
735
        z_header = rest[:z_header_len]
736
        header_len = int(header_len)
737
        header = zlib.decompress(z_header)
738
        if len(header) != header_len:
739
            raise ValueError('invalid length for decompressed bytes')
740
        del z_header
741
        block_len = int(block_len)
742
        if len(rest) != z_header_len + block_len:
743
            raise ValueError('Invalid length for block')
744
        block_bytes = rest[z_header_len:]
745
        del rest
746
        # So now we have a valid GCB, we just need to parse the factories that
747
        # were sent to us
748
        header_lines = header.split('\n')
749
        del header
750
        last = header_lines.pop()
751
        if last != '':
752
            raise ValueError('header lines did not end with a trailing'
753
                             ' newline')
754
        if len(header_lines) % 4 != 0:
755
            raise ValueError('The header was not an even multiple of 4 lines')
756
        block = GroupCompressBlock.from_bytes(block_bytes)
757
        del block_bytes
758
        result = cls(block)
759
        for start in xrange(0, len(header_lines), 4):
760
            # intern()?
761
            key = tuple(header_lines[start].split('\x00'))
762
            parents_line = header_lines[start+1]
763
            if parents_line == 'None:':
764
                parents = None
765
            else:
766
                parents = tuple([tuple(segment.split('\x00'))
767
                                 for segment in parents_line.split('\t')
768
                                  if segment])
769
            start_offset = int(header_lines[start+2])
770
            end_offset = int(header_lines[start+3])
771
            result.add_factory(key, parents, start_offset, end_offset)
772
        return result
773
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
774
3735.32.18 by John Arbash Meinel
We now support generating a network stream.
775
def network_block_to_records(storage_kind, bytes, line_end):
776
    if storage_kind != 'groupcompress-block':
777
        raise ValueError('Unknown storage kind: %s' % (storage_kind,))
778
    manager = _LazyGroupContentManager.from_bytes(bytes)
779
    return manager.get_record_stream()
780
781
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
782
class _CommonGroupCompressor(object):
783
784
    def __init__(self):
785
        """Create a GroupCompressor."""
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
786
        self.chunks = []
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
787
        self._last = None
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
788
        self.endpoint = 0
789
        self.input_bytes = 0
790
        self.labels_deltas = {}
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
791
        self._delta_index = None # Set by the children
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
792
        self._block = GroupCompressBlock()
793
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
794
    def compress(self, key, bytes, expected_sha, nostore_sha=None, soft=False):
795
        """Compress lines with label key.
796
797
        :param key: A key tuple. It is stored in the output
798
            for identification of the text during decompression. If the last
799
            element is 'None' it is replaced with the sha1 of the text -
800
            e.g. sha1:xxxxxxx.
801
        :param bytes: The bytes to be compressed
802
        :param expected_sha: If non-None, the sha the lines are believed to
803
            have. During compression the sha is calculated; a mismatch will
804
            cause an error.
805
        :param nostore_sha: If the computed sha1 sum matches, we will raise
806
            ExistingContent rather than adding the text.
807
        :param soft: Do a 'soft' compression. This means that we require larger
808
            ranges to match to be considered for a copy command.
809
810
        :return: The sha1 of lines, the start and end offsets in the delta, and
811
            the type ('fulltext' or 'delta').
812
813
        :seealso VersionedFiles.add_lines:
814
        """
815
        if not bytes: # empty, like a dir entry, etc
816
            if nostore_sha == _null_sha1:
817
                raise errors.ExistingContent()
818
            return _null_sha1, 0, 0, 'fulltext'
819
        # we assume someone knew what they were doing when they passed it in
820
        if expected_sha is not None:
821
            sha1 = expected_sha
822
        else:
823
            sha1 = osutils.sha_string(bytes)
824
        if nostore_sha is not None:
825
            if sha1 == nostore_sha:
826
                raise errors.ExistingContent()
827
        if key[-1] is None:
828
            key = key[:-1] + ('sha1:' + sha1,)
829
830
        start, end, type = self._compress(key, bytes, len(bytes) / 2, soft)
831
        return sha1, start, end, type
832
833
    def _compress(self, key, bytes, max_delta_size, soft=False):
834
        """Compress lines with label key.
835
836
        :param key: A key tuple. It is stored in the output for identification
837
            of the text during decompression.
838
839
        :param bytes: The bytes to be compressed
840
841
        :param max_delta_size: The size above which we issue a fulltext instead
842
            of a delta.
843
844
        :param soft: Do a 'soft' compression. This means that we require larger
845
            ranges to match to be considered for a copy command.
846
847
        :return: The sha1 of lines, the start and end offsets in the delta, and
848
            the type ('fulltext' or 'delta').
849
        """
850
        raise NotImplementedError(self._compress)
851
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
852
    def extract(self, key):
853
        """Extract a key previously added to the compressor.
854
855
        :param key: The key to extract.
856
        :return: An iterable over bytes and the sha1.
857
        """
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
858
        (start_byte, start_chunk, end_byte, end_chunk) = self.labels_deltas[key]
859
        delta_chunks = self.chunks[start_chunk:end_chunk]
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
860
        stored_bytes = ''.join(delta_chunks)
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
861
        if stored_bytes[0] == 'f':
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
862
            fulltext_len, offset = decode_base128_int(stored_bytes[1:10])
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
863
            data_len = fulltext_len + 1 + offset
864
            if  data_len != len(stored_bytes):
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
865
                raise ValueError('Index claimed fulltext len, but stored bytes'
866
                                 ' claim %s != %s'
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
867
                                 % (len(stored_bytes), data_len))
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
868
            bytes = stored_bytes[offset + 1:]
869
        else:
870
            # XXX: This is inefficient at best
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
871
            source = ''.join(self.chunks[:start_chunk])
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
872
            if stored_bytes[0] != 'd':
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
873
                raise ValueError('Unknown content kind, bytes claim %s'
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
874
                                 % (stored_bytes[0],))
875
            delta_len, offset = decode_base128_int(stored_bytes[1:10])
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
876
            data_len = delta_len + 1 + offset
877
            if data_len != len(stored_bytes):
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
878
                raise ValueError('Index claimed delta len, but stored bytes'
879
                                 ' claim %s != %s'
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
880
                                 % (len(stored_bytes), data_len))
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
881
            bytes = apply_delta(source, stored_bytes[offset + 1:])
882
        bytes_sha1 = osutils.sha_string(bytes)
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
883
        return bytes, bytes_sha1
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
884
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
885
    def flush(self):
886
        """Finish this group, creating a formatted stream.
887
888
        After calling this, the compressor should no longer be used
889
        """
4469.1.2 by John Arbash Meinel
The only caller already knows the content length, so make the api such that
890
        self._block.set_chunked_content(self.chunks, self.endpoint)
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
891
        self.chunks = None
892
        self._delta_index = None
893
        return self._block
894
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
895
    def pop_last(self):
896
        """Call this if you want to 'revoke' the last compression.
897
898
        After this, the data structures will be rolled back, but you cannot do
899
        more compression.
900
        """
901
        self._delta_index = None
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
902
        del self.chunks[self._last[0]:]
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
903
        self.endpoint = self._last[1]
904
        self._last = None
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
905
906
    def ratio(self):
907
        """Return the overall compression ratio."""
908
        return float(self.input_bytes) / float(self.endpoint)
909
910
911
class PythonGroupCompressor(_CommonGroupCompressor):
912
3735.40.2 by John Arbash Meinel
Add a groupcompress.encode_copy_instruction function.
913
    def __init__(self):
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
914
        """Create a GroupCompressor.
915
916
        Used only if the pyrex version is not available.
917
        """
918
        super(PythonGroupCompressor, self).__init__()
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
919
        self._delta_index = LinesDeltaIndex([])
920
        # The actual content is managed by LinesDeltaIndex
921
        self.chunks = self._delta_index.lines
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
922
923
    def _compress(self, key, bytes, max_delta_size, soft=False):
924
        """see _CommonGroupCompressor._compress"""
925
        input_len = len(bytes)
3735.40.2 by John Arbash Meinel
Add a groupcompress.encode_copy_instruction function.
926
        new_lines = osutils.split_lines(bytes)
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
927
        out_lines, index_lines = self._delta_index.make_delta(
928
            new_lines, bytes_length=input_len, soft=soft)
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
929
        delta_length = sum(map(len, out_lines))
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
930
        if delta_length > max_delta_size:
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
931
            # The delta is longer than the fulltext, insert a fulltext
932
            type = 'fulltext'
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
933
            out_lines = ['f', encode_base128_int(input_len)]
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
934
            out_lines.extend(new_lines)
935
            index_lines = [False, False]
936
            index_lines.extend([True] * len(new_lines))
937
        else:
938
            # this is a worthy delta, output it
939
            type = 'delta'
940
            out_lines[0] = 'd'
941
            # Update the delta_length to include those two encoded integers
942
            out_lines[1] = encode_base128_int(delta_length)
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
943
        # Before insertion
944
        start = self.endpoint
945
        chunk_start = len(self.chunks)
4241.17.2 by John Arbash Meinel
PythonGroupCompressor needs to support pop_last() properly.
946
        self._last = (chunk_start, self.endpoint)
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
947
        self._delta_index.extend_lines(out_lines, index_lines)
948
        self.endpoint = self._delta_index.endpoint
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
949
        self.input_bytes += input_len
950
        chunk_end = len(self.chunks)
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
951
        self.labels_deltas[key] = (start, chunk_start,
952
                                   self.endpoint, chunk_end)
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
953
        return start, self.endpoint, type
954
955
956
class PyrexGroupCompressor(_CommonGroupCompressor):
0.17.3 by Robert Collins
new encoder, allows non monotonically increasing sequence matches for moar compression.
957
    """Produce a serialised group of compressed texts.
0.23.6 by John Arbash Meinel
Start stripping out the actual GroupCompressor
958
0.17.3 by Robert Collins
new encoder, allows non monotonically increasing sequence matches for moar compression.
959
    It contains code very similar to SequenceMatcher because of having a similar
960
    task. However some key differences apply:
961
     - there is no junk, we want a minimal edit not a human readable diff.
962
     - we don't filter very common lines (because we don't know where a good
963
       range will start, and after the first text we want to be emitting minmal
964
       edits only.
965
     - we chain the left side, not the right side
966
     - we incrementally update the adjacency matrix as new lines are provided.
967
     - we look for matches in all of the left side, so the routine which does
968
       the analagous task of find_longest_match does not need to filter on the
969
       left side.
970
    """
0.17.2 by Robert Collins
Core proof of concept working.
971
3735.32.19 by John Arbash Meinel
Get rid of the 'delta' flag to GroupCompressor. It didn't do anything anyway.
972
    def __init__(self):
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
973
        super(PyrexGroupCompressor, self).__init__()
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
974
        self._delta_index = DeltaIndex()
0.23.6 by John Arbash Meinel
Start stripping out the actual GroupCompressor
975
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
976
    def _compress(self, key, bytes, max_delta_size, soft=False):
977
        """see _CommonGroupCompressor._compress"""
0.23.52 by John Arbash Meinel
Use the max_delta flag.
978
        input_len = len(bytes)
0.23.12 by John Arbash Meinel
Add a 'len:' field to the data.
979
        # By having action/label/sha1/len, we can parse the group if the index
980
        # was ever destroyed, we have the key in 'label', we know the final
981
        # bytes are valid from sha1, and we know where to find the end of this
982
        # record because of 'len'. (the delta record itself will store the
983
        # total length for the expanded record)
0.23.13 by John Arbash Meinel
Factor out the ability to have/not have labels.
984
        # 'len: %d\n' costs approximately 1% increase in total data
985
        # Having the labels at all costs us 9-10% increase, 38% increase for
986
        # inventory pages, and 5.8% increase for text pages
0.25.6 by John Arbash Meinel
(tests broken) implement the basic ability to have a separate header
987
        # new_chunks = ['label:%s\nsha1:%s\n' % (label, sha1)]
0.23.33 by John Arbash Meinel
Fix a bug when handling multiple large-range copies.
988
        if self._delta_index._source_offset != self.endpoint:
989
            raise AssertionError('_source_offset != endpoint'
990
                ' somehow the DeltaIndex got out of sync with'
991
                ' the output lines')
0.23.52 by John Arbash Meinel
Use the max_delta flag.
992
        delta = self._delta_index.make_delta(bytes, max_delta_size)
993
        if (delta is None):
0.25.10 by John Arbash Meinel
Play around with detecting compression breaks.
994
            type = 'fulltext'
0.17.36 by John Arbash Meinel
Adding a mini-len to the delta/fulltext bytes
995
            enc_length = encode_base128_int(len(bytes))
996
            len_mini_header = 1 + len(enc_length)
997
            self._delta_index.add_source(bytes, len_mini_header)
998
            new_chunks = ['f', enc_length, bytes]
0.23.9 by John Arbash Meinel
We now basically have full support for using diff-delta as the compressor.
999
        else:
0.25.10 by John Arbash Meinel
Play around with detecting compression breaks.
1000
            type = 'delta'
0.17.36 by John Arbash Meinel
Adding a mini-len to the delta/fulltext bytes
1001
            enc_length = encode_base128_int(len(delta))
1002
            len_mini_header = 1 + len(enc_length)
1003
            new_chunks = ['d', enc_length, delta]
3735.38.5 by John Arbash Meinel
A bit of testing showed that _FAST=True was actually *slower*.
1004
            self._delta_index.add_delta_source(delta, len_mini_header)
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
1005
        # Before insertion
1006
        start = self.endpoint
1007
        chunk_start = len(self.chunks)
1008
        # Now output these bytes
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
1009
        self._output_chunks(new_chunks)
0.23.6 by John Arbash Meinel
Start stripping out the actual GroupCompressor
1010
        self.input_bytes += input_len
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
1011
        chunk_end = len(self.chunks)
1012
        self.labels_deltas[key] = (start, chunk_start,
1013
                                   self.endpoint, chunk_end)
0.23.29 by John Arbash Meinel
Forgot to add the delta bytes to the index objects.
1014
        if not self._delta_index._source_offset == self.endpoint:
1015
            raise AssertionError('the delta index is out of sync'
1016
                'with the output lines %s != %s'
1017
                % (self._delta_index._source_offset, self.endpoint))
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1018
        return start, self.endpoint, type
0.17.2 by Robert Collins
Core proof of concept working.
1019
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
1020
    def _output_chunks(self, new_chunks):
0.23.9 by John Arbash Meinel
We now basically have full support for using diff-delta as the compressor.
1021
        """Output some chunks.
1022
1023
        :param new_chunks: The chunks to output.
1024
        """
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
1025
        self._last = (len(self.chunks), self.endpoint)
0.17.12 by Robert Collins
Encode copy ranges as bytes not lines, halves decode overhead.
1026
        endpoint = self.endpoint
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
1027
        self.chunks.extend(new_chunks)
0.23.9 by John Arbash Meinel
We now basically have full support for using diff-delta as the compressor.
1028
        endpoint += sum(map(len, new_chunks))
0.17.12 by Robert Collins
Encode copy ranges as bytes not lines, halves decode overhead.
1029
        self.endpoint = endpoint
0.17.3 by Robert Collins
new encoder, allows non monotonically increasing sequence matches for moar compression.
1030
0.17.11 by Robert Collins
Add extraction of just-compressed texts to support converting from knits.
1031
4465.2.4 by Aaron Bentley
Switch between warn and raise depending on inconsistent_fatal.
1032
def make_pack_factory(graph, delta, keylength, inconsistency_fatal=True):
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
1033
    """Create a factory for creating a pack based groupcompress.
1034
1035
    This is only functional enough to run interface tests, it doesn't try to
1036
    provide a full pack environment.
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
1037
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
1038
    :param graph: Store a graph.
1039
    :param delta: Delta compress contents.
1040
    :param keylength: How long should keys be.
1041
    """
1042
    def factory(transport):
3735.32.2 by John Arbash Meinel
The 'delta' flag has no effect on the content (all GC is delta'd),
1043
        parents = graph
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
1044
        ref_length = 0
1045
        if graph:
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
1046
            ref_length = 1
0.17.7 by Robert Collins
Update for current index2 changes.
1047
        graph_index = BTreeBuilder(reference_lists=ref_length,
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
1048
            key_elements=keylength)
1049
        stream = transport.open_write_stream('newpack')
1050
        writer = pack.ContainerWriter(stream.write)
1051
        writer.begin()
1052
        index = _GCGraphIndex(graph_index, lambda:True, parents=parents,
4465.2.4 by Aaron Bentley
Switch between warn and raise depending on inconsistent_fatal.
1053
            add_callback=graph_index.add_nodes,
1054
            inconsistency_fatal=inconsistency_fatal)
5757.5.1 by Jelmer Vernooij
Move _DirectPackAccess to bzrlib.repofmt.pack_repo.
1055
        access = pack_repo._DirectPackAccess({})
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
1056
        access.set_writer(writer, graph_index, (transport, 'newpack'))
0.17.2 by Robert Collins
Core proof of concept working.
1057
        result = GroupCompressVersionedFiles(index, access, delta)
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
1058
        result.stream = stream
1059
        result.writer = writer
1060
        return result
1061
    return factory
1062
1063
1064
def cleanup_pack_group(versioned_files):
0.17.23 by Robert Collins
Only decompress as much of the zlib data as is needed to read the text recipe.
1065
    versioned_files.writer.end()
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
1066
    versioned_files.stream.close()
1067
1068
4634.3.3 by Andrew Bennetts
Fix bug, add docstrings, improve clarity.
1069
class _BatchingBlockFetcher(object):
1070
    """Fetch group compress blocks in batches.
1071
    
1072
    :ivar total_bytes: int of expected number of bytes needed to fetch the
1073
        currently pending batch.
1074
    """
4634.3.1 by Andrew Bennetts
Add some batching to _get_remaining_record_stream.
1075
1076
    def __init__(self, gcvf, locations):
1077
        self.gcvf = gcvf
1078
        self.locations = locations
1079
        self.keys = []
4634.3.14 by Andrew Bennetts
Some changes prompted by John's review.
1080
        self.batch_memos = {}
1081
        self.memos_to_get = []
4634.3.1 by Andrew Bennetts
Add some batching to _get_remaining_record_stream.
1082
        self.total_bytes = 0
1083
        self.last_read_memo = None
1084
        self.manager = None
1085
1086
    def add_key(self, key):
4634.3.14 by Andrew Bennetts
Some changes prompted by John's review.
1087
        """Add another to key to fetch.
1088
        
1089
        :return: The estimated number of bytes needed to fetch the batch so
1090
            far.
1091
        """
4634.3.1 by Andrew Bennetts
Add some batching to _get_remaining_record_stream.
1092
        self.keys.append(key)
1093
        index_memo, _, _, _ = self.locations[key]
4634.3.3 by Andrew Bennetts
Fix bug, add docstrings, improve clarity.
1094
        read_memo = index_memo[0:3]
4634.3.14 by Andrew Bennetts
Some changes prompted by John's review.
1095
        # Three possibilities for this read_memo:
1096
        #  - it's already part of this batch; or
1097
        #  - it's not yet part of this batch, but is already cached; or
1098
        #  - it's not yet part of this batch and will need to be fetched.
1099
        if read_memo in self.batch_memos:
1100
            # This read memo is already in this batch.
4634.3.16 by Andrew Bennetts
Fix buglets.
1101
            return self.total_bytes
4634.3.14 by Andrew Bennetts
Some changes prompted by John's review.
1102
        try:
1103
            cached_block = self.gcvf._group_cache[read_memo]
1104
        except KeyError:
1105
            # This read memo is new to this batch, and the data isn't cached
1106
            # either.
1107
            self.batch_memos[read_memo] = None
1108
            self.memos_to_get.append(read_memo)
4634.3.12 by Andrew Bennetts
Bump up the batch size to 256k, and fix the batch size estimate to use the length of the raw bytes that will be fetched (not the uncompressed bytes).
1109
            byte_length = read_memo[2]
1110
            self.total_bytes += byte_length
4634.3.14 by Andrew Bennetts
Some changes prompted by John's review.
1111
        else:
1112
            # This read memo is new to this batch, but cached.
1113
            # Keep a reference to the cached block in batch_memos because it's
1114
            # certain that we'll use it when this batch is processed, but
1115
            # there's a risk that it would fall out of _group_cache between now
1116
            # and then.
1117
            self.batch_memos[read_memo] = cached_block
1118
        return self.total_bytes
4634.3.1 by Andrew Bennetts
Add some batching to _get_remaining_record_stream.
1119
        
4634.3.13 by Andrew Bennetts
Rename empty_manager to _flush_manager.
1120
    def _flush_manager(self):
4634.3.3 by Andrew Bennetts
Fix bug, add docstrings, improve clarity.
1121
        if self.manager is not None:
1122
            for factory in self.manager.get_record_stream():
1123
                yield factory
1124
            self.manager = None
4634.3.4 by Andrew Bennetts
Decruftify a little more.
1125
            self.last_read_memo = None
4634.3.3 by Andrew Bennetts
Fix bug, add docstrings, improve clarity.
1126
1127
    def yield_factories(self, full_flush=False):
4634.3.5 by Andrew Bennetts
More docstrings.
1128
        """Yield factories for keys added since the last yield.  They will be
1129
        returned in the order they were added via add_key.
1130
        
1131
        :param full_flush: by default, some results may not be returned in case
1132
            they can be part of the next batch.  If full_flush is True, then
1133
            all results are returned.
1134
        """
4634.3.3 by Andrew Bennetts
Fix bug, add docstrings, improve clarity.
1135
        if self.manager is None and not self.keys:
1136
            return
4634.3.14 by Andrew Bennetts
Some changes prompted by John's review.
1137
        # Fetch all memos in this batch.
1138
        blocks = self.gcvf._get_blocks(self.memos_to_get)
1139
        # Turn blocks into factories and yield them.
1140
        memos_to_get_stack = list(self.memos_to_get)
1141
        memos_to_get_stack.reverse()
4634.3.2 by Andrew Bennetts
Stop using (and remove) unnecessary key_batch var that was causing a bug.
1142
        for key in self.keys:
4634.3.3 by Andrew Bennetts
Fix bug, add docstrings, improve clarity.
1143
            index_memo, _, parents, _ = self.locations[key]
1144
            read_memo = index_memo[:3]
4634.3.4 by Andrew Bennetts
Decruftify a little more.
1145
            if self.last_read_memo != read_memo:
4634.3.1 by Andrew Bennetts
Add some batching to _get_remaining_record_stream.
1146
                # We are starting a new block. If we have a
1147
                # manager, we have found everything that fits for
1148
                # now, so yield records
4634.3.13 by Andrew Bennetts
Rename empty_manager to _flush_manager.
1149
                for factory in self._flush_manager():
4634.3.3 by Andrew Bennetts
Fix bug, add docstrings, improve clarity.
1150
                    yield factory
4634.3.14 by Andrew Bennetts
Some changes prompted by John's review.
1151
                # Now start a new manager.
1152
                if memos_to_get_stack and memos_to_get_stack[-1] == read_memo:
1153
                    # The next block from _get_blocks will be the block we
1154
                    # need.
1155
                    block_read_memo, block = blocks.next()
1156
                    if block_read_memo != read_memo:
1157
                        raise AssertionError(
4634.3.16 by Andrew Bennetts
Fix buglets.
1158
                            "block_read_memo out of sync with read_memo"
1159
                            "(%r != %r)" % (block_read_memo, read_memo))
4634.3.14 by Andrew Bennetts
Some changes prompted by John's review.
1160
                    self.batch_memos[read_memo] = block
1161
                    memos_to_get_stack.pop()
1162
                else:
1163
                    block = self.batch_memos[read_memo]
4634.3.3 by Andrew Bennetts
Fix bug, add docstrings, improve clarity.
1164
                self.manager = _LazyGroupContentManager(block)
4634.3.4 by Andrew Bennetts
Decruftify a little more.
1165
                self.last_read_memo = read_memo
4634.3.1 by Andrew Bennetts
Add some batching to _get_remaining_record_stream.
1166
            start, end = index_memo[3:5]
4634.3.3 by Andrew Bennetts
Fix bug, add docstrings, improve clarity.
1167
            self.manager.add_factory(key, parents, start, end)
4634.3.1 by Andrew Bennetts
Add some batching to _get_remaining_record_stream.
1168
        if full_flush:
4634.3.13 by Andrew Bennetts
Rename empty_manager to _flush_manager.
1169
            for factory in self._flush_manager():
4634.3.3 by Andrew Bennetts
Fix bug, add docstrings, improve clarity.
1170
                yield factory
4634.3.1 by Andrew Bennetts
Add some batching to _get_remaining_record_stream.
1171
        del self.keys[:]
4634.3.14 by Andrew Bennetts
Some changes prompted by John's review.
1172
        self.batch_memos.clear()
1173
        del self.memos_to_get[:]
4634.3.1 by Andrew Bennetts
Add some batching to _get_remaining_record_stream.
1174
        self.total_bytes = 0
1175
1176
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
1177
class GroupCompressVersionedFiles(VersionedFiles):
1178
    """A group-compress based VersionedFiles implementation."""
1179
4634.35.10 by Andrew Bennetts
Move tests to per_repository_chk.
1180
    def __init__(self, index, access, delta=True, _unadded_refs=None):
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
1181
        """Create a GroupCompressVersionedFiles object.
1182
1183
        :param index: The index object storing access and graph data.
1184
        :param access: The access object storing raw data.
0.17.2 by Robert Collins
Core proof of concept working.
1185
        :param delta: Whether to delta compress or just entropy compress.
4634.35.10 by Andrew Bennetts
Move tests to per_repository_chk.
1186
        :param _unadded_refs: private parameter, don't use.
0.17.2 by Robert Collins
Core proof of concept working.
1187
        """
1188
        self._index = index
1189
        self._access = access
1190
        self._delta = delta
4634.35.10 by Andrew Bennetts
Move tests to per_repository_chk.
1191
        if _unadded_refs is None:
1192
            _unadded_refs = {}
1193
        self._unadded_refs = _unadded_refs
0.17.24 by Robert Collins
Add a group cache to decompression, 5 times faster than knit at decompression when accessing everything in a group.
1194
        self._group_cache = LRUSizeCache(max_size=50*1024*1024)
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1195
        self._immediate_fallback_vfs = []
0.17.2 by Robert Collins
Core proof of concept working.
1196
4634.35.1 by Andrew Bennetts
Check for all necessary chk nodes, not just roots.
1197
    def without_fallbacks(self):
4634.35.10 by Andrew Bennetts
Move tests to per_repository_chk.
1198
        """Return a clone of this object without any fallbacks configured."""
1199
        return GroupCompressVersionedFiles(self._index, self._access,
1200
            self._delta, _unadded_refs=dict(self._unadded_refs))
4634.35.1 by Andrew Bennetts
Check for all necessary chk nodes, not just roots.
1201
0.17.2 by Robert Collins
Core proof of concept working.
1202
    def add_lines(self, key, parents, lines, parent_texts=None,
1203
        left_matching_blocks=None, nostore_sha=None, random_id=False,
1204
        check_content=True):
1205
        """Add a text to the store.
1206
1207
        :param key: The key tuple of the text to add.
1208
        :param parents: The parents key tuples of the text to add.
1209
        :param lines: A list of lines. Each line must be a bytestring. And all
1210
            of them except the last must be terminated with \n and contain no
1211
            other \n's. The last line may either contain no \n's or a single
1212
            terminating \n. If the lines list does meet this constraint the add
1213
            routine may error or may succeed - but you will be unable to read
1214
            the data back accurately. (Checking the lines have been split
1215
            correctly is expensive and extremely unlikely to catch bugs so it
1216
            is not done at runtime unless check_content is True.)
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
1217
        :param parent_texts: An optional dictionary containing the opaque
0.17.2 by Robert Collins
Core proof of concept working.
1218
            representations of some or all of the parents of version_id to
1219
            allow delta optimisations.  VERY IMPORTANT: the texts must be those
1220
            returned by add_lines or data corruption can be caused.
1221
        :param left_matching_blocks: a hint about which areas are common
1222
            between the text and its left-hand-parent.  The format is
1223
            the SequenceMatcher.get_matching_blocks format.
1224
        :param nostore_sha: Raise ExistingContent and do not add the lines to
1225
            the versioned file if the digest of the lines matches this.
1226
        :param random_id: If True a random id has been selected rather than
1227
            an id determined by some deterministic process such as a converter
1228
            from a foreign VCS. When True the backend may choose not to check
1229
            for uniqueness of the resulting key within the versioned file, so
1230
            this should only be done when the result is expected to be unique
1231
            anyway.
1232
        :param check_content: If True, the lines supplied are verified to be
1233
            bytestrings that are correctly formed lines.
1234
        :return: The text sha1, the number of bytes in the text, and an opaque
1235
                 representation of the inserted version which can be provided
1236
                 back to future add_lines calls in the parent_texts dictionary.
1237
        """
1238
        self._index._check_write_ok()
1239
        self._check_add(key, lines, random_id, check_content)
1240
        if parents is None:
1241
            # The caller might pass None if there is no graph data, but kndx
1242
            # indexes can't directly store that, so we give them
1243
            # an empty tuple instead.
1244
            parents = ()
1245
        # double handling for now. Make it work until then.
0.20.5 by John Arbash Meinel
Finish the Fulltext => Chunked conversions so that we work in the more-efficient Chunks.
1246
        length = sum(map(len, lines))
1247
        record = ChunkedContentFactory(key, parents, None, lines)
3735.31.12 by John Arbash Meinel
Push nostore_sha down through the stack.
1248
        sha1 = list(self._insert_record_stream([record], random_id=random_id,
1249
                                               nostore_sha=nostore_sha))[0]
0.20.5 by John Arbash Meinel
Finish the Fulltext => Chunked conversions so that we work in the more-efficient Chunks.
1250
        return sha1, length, None
0.17.2 by Robert Collins
Core proof of concept working.
1251
4398.8.6 by John Arbash Meinel
Switch the api from VF.add_text to VF._add_text and trim some extra 'features'.
1252
    def _add_text(self, key, parents, text, nostore_sha=None, random_id=False):
4398.9.1 by Matt Nordhoff
Update _add_text docstrings that still referred to add_text.
1253
        """See VersionedFiles._add_text()."""
4398.8.4 by John Arbash Meinel
Implement add_text for GroupCompressVersionedFiles
1254
        self._index._check_write_ok()
1255
        self._check_add(key, None, random_id, check_content=False)
1256
        if text.__class__ is not str:
1257
            raise errors.BzrBadParameterUnicode("text")
1258
        if parents is None:
1259
            # The caller might pass None if there is no graph data, but kndx
1260
            # indexes can't directly store that, so we give them
1261
            # an empty tuple instead.
1262
            parents = ()
1263
        # double handling for now. Make it work until then.
1264
        length = len(text)
1265
        record = FulltextContentFactory(key, parents, None, text)
1266
        sha1 = list(self._insert_record_stream([record], random_id=random_id,
1267
                                               nostore_sha=nostore_sha))[0]
1268
        return sha1, length, None
1269
3735.31.7 by John Arbash Meinel
Start bringing in stacking support for Groupcompress repos.
1270
    def add_fallback_versioned_files(self, a_versioned_files):
1271
        """Add a source of texts for texts not present in this knit.
1272
1273
        :param a_versioned_files: A VersionedFiles object.
1274
        """
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1275
        self._immediate_fallback_vfs.append(a_versioned_files)
3735.31.7 by John Arbash Meinel
Start bringing in stacking support for Groupcompress repos.
1276
0.17.4 by Robert Collins
Annotate.
1277
    def annotate(self, key):
1278
        """See VersionedFiles.annotate."""
4454.3.58 by John Arbash Meinel
Enable the new annotator for gc format repos.
1279
        ann = annotate.Annotator(self)
1280
        return ann.annotate_flat(key)
0.17.4 by Robert Collins
Annotate.
1281
4454.3.65 by John Arbash Meinel
Tests that VF implementations support .get_annotator()
1282
    def get_annotator(self):
1283
        return annotate.Annotator(self)
1284
4332.3.28 by Robert Collins
Start checking file texts in a single pass.
1285
    def check(self, progress_bar=None, keys=None):
0.17.5 by Robert Collins
nograph tests completely passing.
1286
        """See VersionedFiles.check()."""
4332.3.28 by Robert Collins
Start checking file texts in a single pass.
1287
        if keys is None:
1288
            keys = self.keys()
1289
            for record in self.get_record_stream(keys, 'unordered', True):
1290
                record.get_bytes_as('fulltext')
1291
        else:
1292
            return self.get_record_stream(keys, 'unordered', True)
0.17.5 by Robert Collins
nograph tests completely passing.
1293
4744.2.5 by John Arbash Meinel
Change to a generic 'VersionedFiles.clear_cache()' api.
1294
    def clear_cache(self):
1295
        """See VersionedFiles.clear_cache()"""
1296
        self._group_cache.clear()
4744.2.7 by John Arbash Meinel
Add .clear_cache() members to GraphIndexBuilder and BTreeBuilder.
1297
        self._index._graph_index.clear_cache()
4679.9.19 by John Arbash Meinel
Interning the start and stop group positions saves another 7MB peak mem. \o/
1298
        self._index._int_cache.clear()
4744.2.5 by John Arbash Meinel
Change to a generic 'VersionedFiles.clear_cache()' api.
1299
0.17.2 by Robert Collins
Core proof of concept working.
1300
    def _check_add(self, key, lines, random_id, check_content):
1301
        """check that version_id and lines are safe to add."""
1302
        version_id = key[-1]
0.17.26 by Robert Collins
Working better --gc-plain-chk.
1303
        if version_id is not None:
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1304
            if osutils.contains_whitespace(version_id):
3735.31.1 by John Arbash Meinel
Bring the groupcompress plugin into the brisbane-core branch.
1305
                raise errors.InvalidRevisionId(version_id, self)
0.17.2 by Robert Collins
Core proof of concept working.
1306
        self.check_not_reserved_id(version_id)
1307
        # TODO: If random_id==False and the key is already present, we should
1308
        # probably check that the existing content is identical to what is
1309
        # being inserted, and otherwise raise an exception.  This would make
1310
        # the bundle code simpler.
1311
        if check_content:
1312
            self._check_lines_not_unicode(lines)
1313
            self._check_lines_are_lines(lines)
1314
4593.5.20 by John Arbash Meinel
Expose KnownGraph off of VersionedFiles
1315
    def get_known_graph_ancestry(self, keys):
1316
        """Get a KnownGraph instance with the ancestry of keys."""
4634.11.2 by John Arbash Meinel
Teach VF.get_known_graph_ancestry to go to fallbacks (bug #419241)
1317
        # Note that this is identical to
1318
        # KnitVersionedFiles.get_known_graph_ancestry, but they don't share
1319
        # ancestry.
4634.11.3 by John Arbash Meinel
Implement _GCGraphIndex.find_ancestry()
1320
        parent_map, missing_keys = self._index.find_ancestry(keys)
5050.70.2 by Martin Pool
Search all fallbacks for get_known_graph_ancestry
1321
        for fallback in self._transitive_fallbacks():
4634.11.2 by John Arbash Meinel
Teach VF.get_known_graph_ancestry to go to fallbacks (bug #419241)
1322
            if not missing_keys:
1323
                break
4634.11.3 by John Arbash Meinel
Implement _GCGraphIndex.find_ancestry()
1324
            (f_parent_map, f_missing_keys) = fallback._index.find_ancestry(
1325
                                                missing_keys)
4634.11.2 by John Arbash Meinel
Teach VF.get_known_graph_ancestry to go to fallbacks (bug #419241)
1326
            parent_map.update(f_parent_map)
1327
            missing_keys = f_missing_keys
4593.5.20 by John Arbash Meinel
Expose KnownGraph off of VersionedFiles
1328
        kg = _mod_graph.KnownGraph(parent_map)
1329
        return kg
1330
0.17.5 by Robert Collins
nograph tests completely passing.
1331
    def get_parent_map(self, keys):
3735.31.7 by John Arbash Meinel
Start bringing in stacking support for Groupcompress repos.
1332
        """Get a map of the graph parents of keys.
0.17.5 by Robert Collins
nograph tests completely passing.
1333
1334
        :param keys: The keys to look up parents for.
1335
        :return: A mapping from keys to parents. Absent keys are absent from
1336
            the mapping.
1337
        """
3735.31.7 by John Arbash Meinel
Start bringing in stacking support for Groupcompress repos.
1338
        return self._get_parent_map_with_sources(keys)[0]
1339
1340
    def _get_parent_map_with_sources(self, keys):
1341
        """Get a map of the parents of keys.
1342
1343
        :param keys: The keys to look up parents for.
1344
        :return: A tuple. The first element is a mapping from keys to parents.
1345
            Absent keys are absent from the mapping. The second element is a
1346
            list with the locations each key was found in. The first element
1347
            is the in-this-knit parents, the second the first fallback source,
1348
            and so on.
1349
        """
0.17.5 by Robert Collins
nograph tests completely passing.
1350
        result = {}
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1351
        sources = [self._index] + self._immediate_fallback_vfs
0.17.5 by Robert Collins
nograph tests completely passing.
1352
        source_results = []
1353
        missing = set(keys)
1354
        for source in sources:
1355
            if not missing:
1356
                break
1357
            new_result = source.get_parent_map(missing)
1358
            source_results.append(new_result)
1359
            result.update(new_result)
1360
            missing.difference_update(set(new_result))
3735.31.7 by John Arbash Meinel
Start bringing in stacking support for Groupcompress repos.
1361
        return result, source_results
0.17.5 by Robert Collins
nograph tests completely passing.
1362
4634.3.11 by Andrew Bennetts
Simplify further, comment more.
1363
    def _get_blocks(self, read_memos):
1364
        """Get GroupCompressBlocks for the given read_memos.
1365
4634.3.14 by Andrew Bennetts
Some changes prompted by John's review.
1366
        :returns: a series of (read_memo, block) pairs, in the order they were
1367
            originally passed.
4634.3.11 by Andrew Bennetts
Simplify further, comment more.
1368
        """
4634.3.1 by Andrew Bennetts
Add some batching to _get_remaining_record_stream.
1369
        cached = {}
1370
        for read_memo in read_memos:
1371
            try:
1372
                block = self._group_cache[read_memo]
1373
            except KeyError:
1374
                pass
1375
            else:
1376
                cached[read_memo] = block
4634.3.3 by Andrew Bennetts
Fix bug, add docstrings, improve clarity.
1377
        not_cached = []
1378
        not_cached_seen = set()
1379
        for read_memo in read_memos:
1380
            if read_memo in cached:
1381
                # Don't fetch what we already have
1382
                continue
1383
            if read_memo in not_cached_seen:
1384
                # Don't try to fetch the same data twice
1385
                continue
1386
            not_cached.append(read_memo)
1387
            not_cached_seen.add(read_memo)
4634.3.1 by Andrew Bennetts
Add some batching to _get_remaining_record_stream.
1388
        raw_records = self._access.get_raw_records(not_cached)
1389
        for read_memo in read_memos:
1390
            try:
4634.3.16 by Andrew Bennetts
Fix buglets.
1391
                yield read_memo, cached[read_memo]
4634.3.1 by Andrew Bennetts
Add some batching to _get_remaining_record_stream.
1392
            except KeyError:
4634.3.15 by Andrew Bennetts
Get rid of inaccurate comment.
1393
                # Read the block, and cache it.
4634.3.1 by Andrew Bennetts
Add some batching to _get_remaining_record_stream.
1394
                zdata = raw_records.next()
1395
                block = GroupCompressBlock.from_bytes(zdata)
1396
                self._group_cache[read_memo] = block
4634.3.3 by Andrew Bennetts
Fix bug, add docstrings, improve clarity.
1397
                cached[read_memo] = block
4634.3.14 by Andrew Bennetts
Some changes prompted by John's review.
1398
                yield read_memo, block
4634.3.1 by Andrew Bennetts
Add some batching to _get_remaining_record_stream.
1399
0.20.18 by John Arbash Meinel
Implement new handling of get_bytes_as(), and get_missing_compression_parent_keys()
1400
    def get_missing_compression_parent_keys(self):
1401
        """Return the keys of missing compression parents.
1402
1403
        Missing compression parents occur when a record stream was missing
1404
        basis texts, or a index was scanned that had missing basis texts.
1405
        """
1406
        # GroupCompress cannot currently reference texts that are not in the
1407
        # group, so this is valid for now
1408
        return frozenset()
1409
0.17.5 by Robert Collins
nograph tests completely passing.
1410
    def get_record_stream(self, keys, ordering, include_delta_closure):
1411
        """Get a stream of records for keys.
1412
1413
        :param keys: The keys to include.
1414
        :param ordering: Either 'unordered' or 'topological'. A topologically
1415
            sorted stream has compression parents strictly before their
1416
            children.
1417
        :param include_delta_closure: If True then the closure across any
1418
            compression parents will be included (in the opaque data).
1419
        :return: An iterator of ContentFactory objects, each of which is only
1420
            valid until the iterator is advanced.
1421
        """
1422
        # keys might be a generator
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
1423
        orig_keys = list(keys)
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1424
        keys = set(keys)
0.17.5 by Robert Collins
nograph tests completely passing.
1425
        if not keys:
1426
            return
0.20.23 by John Arbash Meinel
Add a progress indicator for chk pages.
1427
        if (not self._index.has_graph
3735.31.14 by John Arbash Meinel
Change the gc-optimal to 'groupcompress'
1428
            and ordering in ('topological', 'groupcompress')):
0.17.5 by Robert Collins
nograph tests completely passing.
1429
            # Cannot topological order when no graph has been stored.
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1430
            # but we allow 'as-requested' or 'unordered'
0.17.5 by Robert Collins
nograph tests completely passing.
1431
            ordering = 'unordered'
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1432
1433
        remaining_keys = keys
1434
        while True:
1435
            try:
1436
                keys = set(remaining_keys)
1437
                for content_factory in self._get_remaining_record_stream(keys,
1438
                        orig_keys, ordering, include_delta_closure):
1439
                    remaining_keys.discard(content_factory.key)
1440
                    yield content_factory
1441
                return
1442
            except errors.RetryWithNewPacks, e:
1443
                self._access.reload_or_raise(e)
1444
1445
    def _find_from_fallback(self, missing):
1446
        """Find whatever keys you can from the fallbacks.
1447
1448
        :param missing: A set of missing keys. This set will be mutated as keys
1449
            are found from a fallback_vfs
1450
        :return: (parent_map, key_to_source_map, source_results)
1451
            parent_map  the overall key => parent_keys
1452
            key_to_source_map   a dict from {key: source}
1453
            source_results      a list of (source: keys)
1454
        """
1455
        parent_map = {}
1456
        key_to_source_map = {}
1457
        source_results = []
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1458
        for source in self._immediate_fallback_vfs:
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1459
            if not missing:
1460
                break
1461
            source_parents = source.get_parent_map(missing)
1462
            parent_map.update(source_parents)
1463
            source_parents = list(source_parents)
1464
            source_results.append((source, source_parents))
1465
            key_to_source_map.update((key, source) for key in source_parents)
1466
            missing.difference_update(source_parents)
1467
        return parent_map, key_to_source_map, source_results
1468
1469
    def _get_ordered_source_keys(self, ordering, parent_map, key_to_source_map):
1470
        """Get the (source, [keys]) list.
1471
1472
        The returned objects should be in the order defined by 'ordering',
1473
        which can weave between different sources.
1474
        :param ordering: Must be one of 'topological' or 'groupcompress'
1475
        :return: List of [(source, [keys])] tuples, such that all keys are in
1476
            the defined order, regardless of source.
1477
        """
1478
        if ordering == 'topological':
5757.8.4 by Jelmer Vernooij
Fix import.
1479
            present_keys = tsort.topo_sort(parent_map)
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1480
        else:
1481
            # ordering == 'groupcompress'
1482
            # XXX: This only optimizes for the target ordering. We may need
1483
            #      to balance that with the time it takes to extract
1484
            #      ordering, by somehow grouping based on
1485
            #      locations[key][0:3]
1486
            present_keys = sort_gc_optimal(parent_map)
1487
        # Now group by source:
1488
        source_keys = []
1489
        current_source = None
1490
        for key in present_keys:
1491
            source = key_to_source_map.get(key, self)
1492
            if source is not current_source:
1493
                source_keys.append((source, []))
3735.32.12 by John Arbash Meinel
Add groupcompress-block[-ref] as valid stream types.
1494
                current_source = source
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1495
            source_keys[-1][1].append(key)
1496
        return source_keys
1497
1498
    def _get_as_requested_source_keys(self, orig_keys, locations, unadded_keys,
1499
                                      key_to_source_map):
1500
        source_keys = []
1501
        current_source = None
1502
        for key in orig_keys:
1503
            if key in locations or key in unadded_keys:
1504
                source = self
1505
            elif key in key_to_source_map:
1506
                source = key_to_source_map[key]
1507
            else: # absent
1508
                continue
1509
            if source is not current_source:
1510
                source_keys.append((source, []))
3735.32.12 by John Arbash Meinel
Add groupcompress-block[-ref] as valid stream types.
1511
                current_source = source
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1512
            source_keys[-1][1].append(key)
1513
        return source_keys
1514
1515
    def _get_io_ordered_source_keys(self, locations, unadded_keys,
1516
                                    source_result):
1517
        def get_group(key):
1518
            # This is the group the bytes are stored in, followed by the
1519
            # location in the group
1520
            return locations[key][0]
1521
        present_keys = sorted(locations.iterkeys(), key=get_group)
1522
        # We don't have an ordering for keys in the in-memory object, but
1523
        # lets process the in-memory ones first.
1524
        present_keys = list(unadded_keys) + present_keys
1525
        # Now grab all of the ones from other sources
1526
        source_keys = [(self, present_keys)]
1527
        source_keys.extend(source_result)
1528
        return source_keys
1529
1530
    def _get_remaining_record_stream(self, keys, orig_keys, ordering,
1531
                                     include_delta_closure):
1532
        """Get a stream of records for keys.
1533
1534
        :param keys: The keys to include.
1535
        :param ordering: one of 'unordered', 'topological', 'groupcompress' or
1536
            'as-requested'
1537
        :param include_delta_closure: If True then the closure across any
1538
            compression parents will be included (in the opaque data).
1539
        :return: An iterator of ContentFactory objects, each of which is only
1540
            valid until the iterator is advanced.
1541
        """
0.17.5 by Robert Collins
nograph tests completely passing.
1542
        # Cheap: iterate
1543
        locations = self._index.get_build_details(keys)
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1544
        unadded_keys = set(self._unadded_refs).intersection(keys)
1545
        missing = keys.difference(locations)
1546
        missing.difference_update(unadded_keys)
1547
        (fallback_parent_map, key_to_source_map,
1548
         source_result) = self._find_from_fallback(missing)
1549
        if ordering in ('topological', 'groupcompress'):
0.17.5 by Robert Collins
nograph tests completely passing.
1550
            # would be better to not globally sort initially but instead
1551
            # start with one key, recurse to its oldest parent, then grab
1552
            # everything in the same group, etc.
1553
            parent_map = dict((key, details[2]) for key, details in
1554
                locations.iteritems())
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1555
            for key in unadded_keys:
1556
                parent_map[key] = self._unadded_refs[key]
1557
            parent_map.update(fallback_parent_map)
1558
            source_keys = self._get_ordered_source_keys(ordering, parent_map,
1559
                                                        key_to_source_map)
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
1560
        elif ordering == 'as-requested':
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1561
            source_keys = self._get_as_requested_source_keys(orig_keys,
1562
                locations, unadded_keys, key_to_source_map)
0.17.5 by Robert Collins
nograph tests completely passing.
1563
        else:
0.20.10 by John Arbash Meinel
Change the extraction ordering for 'unordered'.
1564
            # We want to yield the keys in a semi-optimal (read-wise) ordering.
1565
            # Otherwise we thrash the _group_cache and destroy performance
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1566
            source_keys = self._get_io_ordered_source_keys(locations,
1567
                unadded_keys, source_result)
1568
        for key in missing:
0.17.5 by Robert Collins
nograph tests completely passing.
1569
            yield AbsentContentFactory(key)
4634.3.3 by Andrew Bennetts
Fix bug, add docstrings, improve clarity.
1570
        # Batch up as many keys as we can until either:
1571
        #  - we encounter an unadded ref, or
1572
        #  - we run out of keys, or
4634.3.17 by Andrew Bennetts
Make BATCH_SIZE a global.
1573
        #  - the total bytes to retrieve for this batch > BATCH_SIZE
4634.3.3 by Andrew Bennetts
Fix bug, add docstrings, improve clarity.
1574
        batcher = _BatchingBlockFetcher(self, locations)
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1575
        for source, keys in source_keys:
1576
            if source is self:
1577
                for key in keys:
1578
                    if key in self._unadded_refs:
4634.3.8 by Andrew Bennetts
Tweak some comments.
1579
                        # Flush batch, then yield unadded ref from
1580
                        # self._compressor.
4634.3.14 by Andrew Bennetts
Some changes prompted by John's review.
1581
                        for factory in batcher.yield_factories(full_flush=True):
1582
                            yield factory
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1583
                        bytes, sha1 = self._compressor.extract(key)
1584
                        parents = self._unadded_refs[key]
3735.32.12 by John Arbash Meinel
Add groupcompress-block[-ref] as valid stream types.
1585
                        yield FulltextContentFactory(key, parents, sha1, bytes)
4634.3.1 by Andrew Bennetts
Add some batching to _get_remaining_record_stream.
1586
                        continue
4634.3.14 by Andrew Bennetts
Some changes prompted by John's review.
1587
                    if batcher.add_key(key) > BATCH_SIZE:
4634.3.8 by Andrew Bennetts
Tweak some comments.
1588
                        # Ok, this batch is big enough.  Yield some results.
4634.3.14 by Andrew Bennetts
Some changes prompted by John's review.
1589
                        for factory in batcher.yield_factories():
1590
                            yield factory
0.17.11 by Robert Collins
Add extraction of just-compressed texts to support converting from knits.
1591
            else:
4634.3.14 by Andrew Bennetts
Some changes prompted by John's review.
1592
                for factory in batcher.yield_factories(full_flush=True):
1593
                    yield factory
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1594
                for record in source.get_record_stream(keys, ordering,
1595
                                                       include_delta_closure):
1596
                    yield record
4634.3.14 by Andrew Bennetts
Some changes prompted by John's review.
1597
        for factory in batcher.yield_factories(full_flush=True):
1598
            yield factory
0.20.5 by John Arbash Meinel
Finish the Fulltext => Chunked conversions so that we work in the more-efficient Chunks.
1599
0.17.5 by Robert Collins
nograph tests completely passing.
1600
    def get_sha1s(self, keys):
1601
        """See VersionedFiles.get_sha1s()."""
1602
        result = {}
1603
        for record in self.get_record_stream(keys, 'unordered', True):
1604
            if record.sha1 != None:
1605
                result[record.key] = record.sha1
1606
            else:
1607
                if record.storage_kind != 'absent':
3735.40.2 by John Arbash Meinel
Add a groupcompress.encode_copy_instruction function.
1608
                    result[record.key] = osutils.sha_string(
1609
                        record.get_bytes_as('fulltext'))
0.17.5 by Robert Collins
nograph tests completely passing.
1610
        return result
1611
5195.3.26 by Parth Malwankar
reverted changes done to insert_record_stream API
1612
    def insert_record_stream(self, stream):
0.17.2 by Robert Collins
Core proof of concept working.
1613
        """Insert a record stream into this container.
1614
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
1615
        :param stream: A stream of records to insert.
0.17.2 by Robert Collins
Core proof of concept working.
1616
        :return: None
1617
        :seealso VersionedFiles.get_record_stream:
1618
        """
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1619
        # XXX: Setting random_id=True makes
1620
        # test_insert_record_stream_existing_keys fail for groupcompress and
1621
        # groupcompress-nograph, this needs to be revisited while addressing
1622
        # 'bzr branch' performance issues.
5195.3.26 by Parth Malwankar
reverted changes done to insert_record_stream API
1623
        for _ in self._insert_record_stream(stream, random_id=False):
0.17.5 by Robert Collins
nograph tests completely passing.
1624
            pass
0.17.2 by Robert Collins
Core proof of concept working.
1625
3735.32.21 by John Arbash Meinel
We now have a 'reuse_blocks=False' flag for autopack et al.
1626
    def _insert_record_stream(self, stream, random_id=False, nostore_sha=None,
5195.3.26 by Parth Malwankar
reverted changes done to insert_record_stream API
1627
                              reuse_blocks=True):
0.17.2 by Robert Collins
Core proof of concept working.
1628
        """Internal core to insert a record stream into this container.
1629
1630
        This helper function has a different interface than insert_record_stream
1631
        to allow add_lines to be minimal, but still return the needed data.
1632
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
1633
        :param stream: A stream of records to insert.
3735.31.12 by John Arbash Meinel
Push nostore_sha down through the stack.
1634
        :param nostore_sha: If the sha1 of a given text matches nostore_sha,
1635
            raise ExistingContent, rather than committing the new text.
3735.32.21 by John Arbash Meinel
We now have a 'reuse_blocks=False' flag for autopack et al.
1636
        :param reuse_blocks: If the source is streaming from
1637
            groupcompress-blocks, just insert the blocks as-is, rather than
1638
            expanding the texts and inserting again.
0.17.2 by Robert Collins
Core proof of concept working.
1639
        :return: An iterator over the sha1 of the inserted records.
1640
        :seealso insert_record_stream:
1641
        :seealso add_lines:
1642
        """
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
1643
        adapters = {}
0.17.5 by Robert Collins
nograph tests completely passing.
1644
        def get_adapter(adapter_key):
1645
            try:
1646
                return adapters[adapter_key]
1647
            except KeyError:
1648
                adapter_factory = adapter_registry.get(adapter_key)
1649
                adapter = adapter_factory(self)
1650
                adapters[adapter_key] = adapter
1651
                return adapter
0.17.2 by Robert Collins
Core proof of concept working.
1652
        # This will go up to fulltexts for gc to gc fetching, which isn't
1653
        # ideal.
3735.32.19 by John Arbash Meinel
Get rid of the 'delta' flag to GroupCompressor. It didn't do anything anyway.
1654
        self._compressor = GroupCompressor()
0.17.11 by Robert Collins
Add extraction of just-compressed texts to support converting from knits.
1655
        self._unadded_refs = {}
0.17.5 by Robert Collins
nograph tests completely passing.
1656
        keys_to_add = []
0.17.6 by Robert Collins
Cap group size at 20MB internal buffer. (Probably way too big).
1657
        def flush():
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
1658
            bytes_len, chunks = self._compressor.flush().to_chunks()
4634.139.9 by John Arbash Meinel
Partial fix for bug #566940.
1659
            self._compressor = GroupCompressor()
5439.2.1 by John Arbash Meinel
Change GroupCompressBlock to work in self._z_compress_chunks
1660
            # Note: At this point we still have 1 copy of the fulltext (in
1661
            #       record and the var 'bytes'), and this generates 2 copies of
1662
            #       the compressed text (one for bytes, one in chunks)
1663
            # TODO: Push 'chunks' down into the _access api, so that we don't
1664
            #       have to double compressed memory here
1665
            # TODO: Figure out how to indicate that we would be happy to free
1666
            #       the fulltext content at this point. Note that sometimes we
1667
            #       will want it later (streaming CHK pages), but most of the
1668
            #       time we won't (everything else)
1669
            bytes = ''.join(chunks)
1670
            del chunks
0.17.6 by Robert Collins
Cap group size at 20MB internal buffer. (Probably way too big).
1671
            index, start, length = self._access.add_raw_records(
0.25.7 by John Arbash Meinel
Have the GroupCompressBlock decide how to compress the header and content.
1672
                [(None, len(bytes))], bytes)[0]
0.17.6 by Robert Collins
Cap group size at 20MB internal buffer. (Probably way too big).
1673
            nodes = []
1674
            for key, reads, refs in keys_to_add:
1675
                nodes.append((key, "%d %d %s" % (start, length, reads), refs))
1676
            self._index.add_records(nodes, random_id=random_id)
0.25.10 by John Arbash Meinel
Play around with detecting compression breaks.
1677
            self._unadded_refs = {}
1678
            del keys_to_add[:]
1679
0.20.15 by John Arbash Meinel
Change so that regions that have lots of copies get converted back
1680
        last_prefix = None
0.25.10 by John Arbash Meinel
Play around with detecting compression breaks.
1681
        max_fulltext_len = 0
0.25.11 by John Arbash Meinel
Slightly different handling of large texts.
1682
        max_fulltext_prefix = None
3735.32.20 by John Arbash Meinel
groupcompress now copies the blocks exactly as they were given.
1683
        insert_manager = None
1684
        block_start = None
1685
        block_length = None
3735.36.15 by John Arbash Meinel
Set 'combine_backing_indices=False' as the default for text and chk indices.
1686
        # XXX: TODO: remove this, it is just for safety checking for now
1687
        inserted_keys = set()
4665.3.9 by John Arbash Meinel
Start doing some work to make sure that we call _check_rebuild_block
1688
        reuse_this_block = reuse_blocks
0.17.2 by Robert Collins
Core proof of concept working.
1689
        for record in stream:
0.17.5 by Robert Collins
nograph tests completely passing.
1690
            # Raise an error when a record is missing.
1691
            if record.storage_kind == 'absent':
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
1692
                raise errors.RevisionNotPresent(record.key, self)
3735.36.15 by John Arbash Meinel
Set 'combine_backing_indices=False' as the default for text and chk indices.
1693
            if random_id:
1694
                if record.key in inserted_keys:
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1695
                    trace.note('Insert claimed random_id=True,'
1696
                               ' but then inserted %r two times', record.key)
3735.36.15 by John Arbash Meinel
Set 'combine_backing_indices=False' as the default for text and chk indices.
1697
                    continue
1698
                inserted_keys.add(record.key)
4665.3.9 by John Arbash Meinel
Start doing some work to make sure that we call _check_rebuild_block
1699
            if reuse_blocks:
3735.32.21 by John Arbash Meinel
We now have a 'reuse_blocks=False' flag for autopack et al.
1700
                # If the reuse_blocks flag is set, check to see if we can just
1701
                # copy a groupcompress block as-is.
4665.3.10 by John Arbash Meinel
Get a test written which exercises the 'trim' code path.
1702
                # We only check on the first record (groupcompress-block) not
1703
                # on all of the (groupcompress-block-ref) entries.
1704
                # The reuse_this_block flag is then kept for as long as
4634.23.1 by Robert Collins
Cherrypick from bzr.dev: Fix bug 402652: recompress badly packed groups during fetch. (John Arbash Meinel, Robert Collins)
1705
                if record.storage_kind == 'groupcompress-block':
4665.3.2 by John Arbash Meinel
An alternative implementation that passes both tests.
1706
                    # Check to see if we really want to re-use this block
1707
                    insert_manager = record._manager
4665.3.9 by John Arbash Meinel
Start doing some work to make sure that we call _check_rebuild_block
1708
                    reuse_this_block = insert_manager.check_is_well_utilized()
4665.3.10 by John Arbash Meinel
Get a test written which exercises the 'trim' code path.
1709
            else:
1710
                reuse_this_block = False
4665.3.2 by John Arbash Meinel
An alternative implementation that passes both tests.
1711
            if reuse_this_block:
1712
                # We still want to reuse this block
1713
                if record.storage_kind == 'groupcompress-block':
3735.32.21 by John Arbash Meinel
We now have a 'reuse_blocks=False' flag for autopack et al.
1714
                    # Insert the raw block into the target repo
1715
                    insert_manager = record._manager
1716
                    bytes = record._manager._block.to_bytes()
1717
                    _, start, length = self._access.add_raw_records(
1718
                        [(None, len(bytes))], bytes)[0]
1719
                    del bytes
1720
                    block_start = start
1721
                    block_length = length
1722
                if record.storage_kind in ('groupcompress-block',
1723
                                           'groupcompress-block-ref'):
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1724
                    if insert_manager is None:
1725
                        raise AssertionError('No insert_manager set')
4665.3.4 by John Arbash Meinel
Refactor the check_rebuild code a bit, so that we can potentially
1726
                    if insert_manager is not record._manager:
1727
                        raise AssertionError('insert_manager does not match'
1728
                            ' the current record, we cannot be positive'
1729
                            ' that the appropriate content was inserted.'
1730
                            )
3735.32.21 by John Arbash Meinel
We now have a 'reuse_blocks=False' flag for autopack et al.
1731
                    value = "%d %d %d %d" % (block_start, block_length,
1732
                                             record._start, record._end)
1733
                    nodes = [(record.key, value, (record.parents,))]
3735.38.1 by John Arbash Meinel
Change the delta byte stream to remove the 'source length' entry.
1734
                    # TODO: Consider buffering up many nodes to be added, not
1735
                    #       sure how much overhead this has, but we're seeing
1736
                    #       ~23s / 120s in add_records calls
3735.32.21 by John Arbash Meinel
We now have a 'reuse_blocks=False' flag for autopack et al.
1737
                    self._index.add_records(nodes, random_id=random_id)
1738
                    continue
0.20.18 by John Arbash Meinel
Implement new handling of get_bytes_as(), and get_missing_compression_parent_keys()
1739
            try:
0.23.52 by John Arbash Meinel
Use the max_delta flag.
1740
                bytes = record.get_bytes_as('fulltext')
0.20.18 by John Arbash Meinel
Implement new handling of get_bytes_as(), and get_missing_compression_parent_keys()
1741
            except errors.UnavailableRepresentation:
0.17.5 by Robert Collins
nograph tests completely passing.
1742
                adapter_key = record.storage_kind, 'fulltext'
1743
                adapter = get_adapter(adapter_key)
0.20.21 by John Arbash Meinel
Merge the chk sorting code.
1744
                bytes = adapter.get_bytes(record)
0.20.13 by John Arbash Meinel
Play around a bit.
1745
            if len(record.key) > 1:
1746
                prefix = record.key[0]
0.25.11 by John Arbash Meinel
Slightly different handling of large texts.
1747
                soft = (prefix == last_prefix)
0.25.10 by John Arbash Meinel
Play around with detecting compression breaks.
1748
            else:
1749
                prefix = None
0.25.11 by John Arbash Meinel
Slightly different handling of large texts.
1750
                soft = False
1751
            if max_fulltext_len < len(bytes):
1752
                max_fulltext_len = len(bytes)
1753
                max_fulltext_prefix = prefix
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1754
            (found_sha1, start_point, end_point,
1755
             type) = self._compressor.compress(record.key,
1756
                                               bytes, record.sha1, soft=soft,
1757
                                               nostore_sha=nostore_sha)
1758
            # delta_ratio = float(len(bytes)) / (end_point - start_point)
0.25.10 by John Arbash Meinel
Play around with detecting compression breaks.
1759
            # Check if we want to continue to include that text
0.25.11 by John Arbash Meinel
Slightly different handling of large texts.
1760
            if (prefix == max_fulltext_prefix
1761
                and end_point < 2 * max_fulltext_len):
1762
                # As long as we are on the same file_id, we will fill at least
1763
                # 2 * max_fulltext_len
1764
                start_new_block = False
1765
            elif end_point > 4*1024*1024:
1766
                start_new_block = True
1767
            elif (prefix is not None and prefix != last_prefix
1768
                  and end_point > 2*1024*1024):
1769
                start_new_block = True
1770
            else:
1771
                start_new_block = False
0.25.10 by John Arbash Meinel
Play around with detecting compression breaks.
1772
            last_prefix = prefix
1773
            if start_new_block:
1774
                self._compressor.pop_last()
1775
                flush()
1776
                max_fulltext_len = len(bytes)
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1777
                (found_sha1, start_point, end_point,
1778
                 type) = self._compressor.compress(record.key, bytes,
1779
                                                   record.sha1)
0.17.26 by Robert Collins
Working better --gc-plain-chk.
1780
            if record.key[-1] is None:
1781
                key = record.key[:-1] + ('sha1:' + found_sha1,)
1782
            else:
1783
                key = record.key
1784
            self._unadded_refs[key] = record.parents
0.17.3 by Robert Collins
new encoder, allows non monotonically increasing sequence matches for moar compression.
1785
            yield found_sha1
4842.1.1 by Andrew Bennetts
Fix crash involving static_tuple when C extensions are not built.
1786
            as_st = static_tuple.StaticTuple.from_sequence
1787
            if record.parents is not None:
1788
                parents = as_st([as_st(p) for p in record.parents])
1789
            else:
1790
                parents = None
1791
            refs = static_tuple.StaticTuple(parents)
1792
            keys_to_add.append((key, '%d %d' % (start_point, end_point), refs))
0.17.8 by Robert Collins
Flush pending updates at the end of _insert_record_stream
1793
        if len(keys_to_add):
1794
            flush()
0.17.11 by Robert Collins
Add extraction of just-compressed texts to support converting from knits.
1795
        self._compressor = None
5195.3.12 by Parth Malwankar
initial approximation of progress.
1796
0.17.5 by Robert Collins
nograph tests completely passing.
1797
    def iter_lines_added_or_present_in_keys(self, keys, pb=None):
1798
        """Iterate over the lines in the versioned files from keys.
1799
1800
        This may return lines from other keys. Each item the returned
1801
        iterator yields is a tuple of a line and a text version that that line
1802
        is present in (not introduced in).
1803
1804
        Ordering of results is in whatever order is most suitable for the
1805
        underlying storage format.
1806
1807
        If a progress bar is supplied, it may be used to indicate progress.
1808
        The caller is responsible for cleaning up progress bars (because this
1809
        is an iterator).
1810
1811
        NOTES:
1812
         * Lines are normalised by the underlying store: they will all have \n
1813
           terminators.
1814
         * Lines are returned in arbitrary order.
1815
1816
        :return: An iterator over (line, key).
1817
        """
1818
        keys = set(keys)
1819
        total = len(keys)
1820
        # we don't care about inclusions, the caller cares.
1821
        # but we need to setup a list of records to visit.
1822
        # we need key, position, length
1823
        for key_idx, record in enumerate(self.get_record_stream(keys,
1824
            'unordered', True)):
1825
            # XXX: todo - optimise to use less than full texts.
1826
            key = record.key
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
1827
            if pb is not None:
1828
                pb.update('Walking content', key_idx, total)
0.17.5 by Robert Collins
nograph tests completely passing.
1829
            if record.storage_kind == 'absent':
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
1830
                raise errors.RevisionNotPresent(key, self)
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1831
            lines = osutils.split_lines(record.get_bytes_as('fulltext'))
0.17.5 by Robert Collins
nograph tests completely passing.
1832
            for line in lines:
1833
                yield line, key
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
1834
        if pb is not None:
1835
            pb.update('Walking content', total, total)
0.17.5 by Robert Collins
nograph tests completely passing.
1836
1837
    def keys(self):
1838
        """See VersionedFiles.keys."""
1839
        if 'evil' in debug.debug_flags:
1840
            trace.mutter_callsite(2, "keys scales with size of history")
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1841
        sources = [self._index] + self._immediate_fallback_vfs
0.17.5 by Robert Collins
nograph tests completely passing.
1842
        result = set()
1843
        for source in sources:
1844
            result.update(source.keys())
1845
        return result
1846
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
1847
5365.4.1 by John Arbash Meinel
Find a case where we are wasting a bit of memory.
1848
class _GCBuildDetails(object):
1849
    """A blob of data about the build details.
1850
1851
    This stores the minimal data, which then allows compatibility with the old
1852
    api, without taking as much memory.
1853
    """
1854
1855
    __slots__ = ('_index', '_group_start', '_group_end', '_basis_end',
1856
                 '_delta_end', '_parents')
1857
1858
    method = 'group'
1859
    compression_parent = None
1860
1861
    def __init__(self, parents, position_info):
1862
        self._parents = parents
5365.4.2 by John Arbash Meinel
As suggested by Martin <gz>, switch to tuple unpacking for attribute assignment
1863
        (self._index, self._group_start, self._group_end, self._basis_end,
1864
         self._delta_end) = position_info
5365.4.1 by John Arbash Meinel
Find a case where we are wasting a bit of memory.
1865
1866
    def __repr__(self):
1867
        return '%s(%s, %s)' % (self.__class__.__name__,
1868
            self.index_memo, self._parents)
1869
1870
    @property
1871
    def index_memo(self):
1872
        return (self._index, self._group_start, self._group_end,
1873
                self._basis_end, self._delta_end)
1874
1875
    @property
1876
    def record_details(self):
1877
        return static_tuple.StaticTuple(self.method, None)
1878
1879
    def __getitem__(self, offset):
1880
        """Compatibility thunk to act like a tuple."""
1881
        if offset == 0:
1882
            return self.index_memo
1883
        elif offset == 1:
1884
            return self.compression_parent # Always None
1885
        elif offset == 2:
1886
            return self._parents
1887
        elif offset == 3:
1888
            return self.record_details
1889
        else:
1890
            raise IndexError('offset out of range')
1891
            
1892
    def __len__(self):
1893
        return 4
1894
1895
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
1896
class _GCGraphIndex(object):
1897
    """Mapper from GroupCompressVersionedFiles needs into GraphIndex storage."""
1898
0.17.9 by Robert Collins
Initial stab at repository format support.
1899
    def __init__(self, graph_index, is_locked, parents=True,
4465.2.4 by Aaron Bentley
Switch between warn and raise depending on inconsistent_fatal.
1900
        add_callback=None, track_external_parent_refs=False,
4634.29.1 by Andrew Bennetts
Rough code to reject commit_write_group if any inventory's CHK root is absent.
1901
        inconsistency_fatal=True, track_new_keys=False):
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
1902
        """Construct a _GCGraphIndex on a graph_index.
1903
1904
        :param graph_index: An implementation of bzrlib.index.GraphIndex.
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
1905
        :param is_locked: A callback, returns True if the index is locked and
1906
            thus usable.
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
1907
        :param parents: If True, record knits parents, if not do not record
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
1908
            parents.
1909
        :param add_callback: If not None, allow additions to the index and call
1910
            this callback with a list of added GraphIndex nodes:
1911
            [(node, value, node_refs), ...]
4343.3.21 by John Arbash Meinel
Implement get_missing_parents in terms of _KeyRefs.
1912
        :param track_external_parent_refs: As keys are added, keep track of the
1913
            keys they reference, so that we can query get_missing_parents(),
1914
            etc.
4465.2.4 by Aaron Bentley
Switch between warn and raise depending on inconsistent_fatal.
1915
        :param inconsistency_fatal: When asked to add records that are already
1916
            present, and the details are inconsistent with the existing
1917
            record, raise an exception instead of warning (and skipping the
1918
            record).
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
1919
        """
1920
        self._add_callback = add_callback
1921
        self._graph_index = graph_index
1922
        self._parents = parents
1923
        self.has_graph = parents
1924
        self._is_locked = is_locked
4465.2.4 by Aaron Bentley
Switch between warn and raise depending on inconsistent_fatal.
1925
        self._inconsistency_fatal = inconsistency_fatal
4679.9.19 by John Arbash Meinel
Interning the start and stop group positions saves another 7MB peak mem. \o/
1926
        # GroupCompress records tend to have the same 'group' start + offset
1927
        # repeated over and over, this creates a surplus of ints
1928
        self._int_cache = {}
4343.3.21 by John Arbash Meinel
Implement get_missing_parents in terms of _KeyRefs.
1929
        if track_external_parent_refs:
5757.8.1 by Jelmer Vernooij
Avoid bzrlib.knit imports when using groupcompress repositories.
1930
            self._key_dependencies = _KeyRefs(
4634.29.6 by Andrew Bennetts
Put new key tracking in _KeyRefs rather than alongside it.
1931
                track_new_keys=track_new_keys)
4343.3.21 by John Arbash Meinel
Implement get_missing_parents in terms of _KeyRefs.
1932
        else:
1933
            self._key_dependencies = None
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
1934
0.17.5 by Robert Collins
nograph tests completely passing.
1935
    def add_records(self, records, random_id=False):
1936
        """Add multiple records to the index.
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
1937
0.17.5 by Robert Collins
nograph tests completely passing.
1938
        This function does not insert data into the Immutable GraphIndex
1939
        backing the KnitGraphIndex, instead it prepares data for insertion by
1940
        the caller and checks that it is safe to insert then calls
1941
        self._add_callback with the prepared GraphIndex nodes.
1942
1943
        :param records: a list of tuples:
1944
                         (key, options, access_memo, parents).
1945
        :param random_id: If True the ids being added were randomly generated
1946
            and no check for existence will be performed.
1947
        """
1948
        if not self._add_callback:
1949
            raise errors.ReadOnlyError(self)
1950
        # we hope there are no repositories with inconsistent parentage
1951
        # anymore.
1952
1953
        changed = False
1954
        keys = {}
1955
        for (key, value, refs) in records:
1956
            if not self._parents:
1957
                if refs:
1958
                    for ref in refs:
1959
                        if ref:
4398.8.1 by John Arbash Meinel
Add a VersionedFile.add_text() api.
1960
                            raise errors.KnitCorrupt(self,
0.17.5 by Robert Collins
nograph tests completely passing.
1961
                                "attempt to add node with parents "
1962
                                "in parentless index.")
1963
                    refs = ()
1964
                    changed = True
1965
            keys[key] = (value, refs)
1966
        # check for dups
1967
        if not random_id:
1968
            present_nodes = self._get_entries(keys)
1969
            for (index, key, value, node_refs) in present_nodes:
4789.28.3 by John Arbash Meinel
Add a static_tuple.as_tuples() helper.
1970
                # Sometimes these are passed as a list rather than a tuple
1971
                node_refs = static_tuple.as_tuples(node_refs)
1972
                passed = static_tuple.as_tuples(keys[key])
1973
                if node_refs != passed[1]:
1974
                    details = '%s %s %s' % (key, (value, node_refs), passed)
4465.2.4 by Aaron Bentley
Switch between warn and raise depending on inconsistent_fatal.
1975
                    if self._inconsistency_fatal:
1976
                        raise errors.KnitCorrupt(self, "inconsistent details"
1977
                                                 " in add_records: %s" %
1978
                                                 details)
1979
                    else:
1980
                        trace.warning("inconsistent details in skipped"
1981
                                      " record: %s", details)
0.17.5 by Robert Collins
nograph tests completely passing.
1982
                del keys[key]
1983
                changed = True
1984
        if changed:
1985
            result = []
1986
            if self._parents:
1987
                for key, (value, node_refs) in keys.iteritems():
1988
                    result.append((key, value, node_refs))
1989
            else:
1990
                for key, (value, node_refs) in keys.iteritems():
1991
                    result.append((key, value))
1992
            records = result
4343.3.21 by John Arbash Meinel
Implement get_missing_parents in terms of _KeyRefs.
1993
        key_dependencies = self._key_dependencies
4634.29.6 by Andrew Bennetts
Put new key tracking in _KeyRefs rather than alongside it.
1994
        if key_dependencies is not None:
1995
            if self._parents:
1996
                for key, value, refs in records:
1997
                    parents = refs[0]
1998
                    key_dependencies.add_references(key, parents)
1999
            else:
2000
                for key, value, refs in records:
2001
                    new_keys.add_key(key)
0.17.5 by Robert Collins
nograph tests completely passing.
2002
        self._add_callback(records)
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
2003
0.17.5 by Robert Collins
nograph tests completely passing.
2004
    def _check_read(self):
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
2005
        """Raise an exception if reads are not permitted."""
0.17.5 by Robert Collins
nograph tests completely passing.
2006
        if not self._is_locked():
2007
            raise errors.ObjectNotLocked(self)
2008
0.17.2 by Robert Collins
Core proof of concept working.
2009
    def _check_write_ok(self):
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
2010
        """Raise an exception if writes are not permitted."""
0.17.2 by Robert Collins
Core proof of concept working.
2011
        if not self._is_locked():
2012
            raise errors.ObjectNotLocked(self)
2013
0.17.5 by Robert Collins
nograph tests completely passing.
2014
    def _get_entries(self, keys, check_present=False):
2015
        """Get the entries for keys.
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
2016
2017
        Note: Callers are responsible for checking that the index is locked
2018
        before calling this method.
2019
0.17.5 by Robert Collins
nograph tests completely passing.
2020
        :param keys: An iterable of index key tuples.
2021
        """
2022
        keys = set(keys)
2023
        found_keys = set()
2024
        if self._parents:
2025
            for node in self._graph_index.iter_entries(keys):
2026
                yield node
2027
                found_keys.add(node[1])
2028
        else:
2029
            # adapt parentless index to the rest of the code.
2030
            for node in self._graph_index.iter_entries(keys):
2031
                yield node[0], node[1], node[2], ()
2032
                found_keys.add(node[1])
2033
        if check_present:
2034
            missing_keys = keys.difference(found_keys)
2035
            if missing_keys:
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
2036
                raise errors.RevisionNotPresent(missing_keys.pop(), self)
0.17.5 by Robert Collins
nograph tests completely passing.
2037
4634.11.3 by John Arbash Meinel
Implement _GCGraphIndex.find_ancestry()
2038
    def find_ancestry(self, keys):
2039
        """See CombinedGraphIndex.find_ancestry"""
2040
        return self._graph_index.find_ancestry(keys, 0)
2041
0.17.5 by Robert Collins
nograph tests completely passing.
2042
    def get_parent_map(self, keys):
2043
        """Get a map of the parents of keys.
2044
2045
        :param keys: The keys to look up parents for.
2046
        :return: A mapping from keys to parents. Absent keys are absent from
2047
            the mapping.
2048
        """
2049
        self._check_read()
2050
        nodes = self._get_entries(keys)
2051
        result = {}
2052
        if self._parents:
2053
            for node in nodes:
2054
                result[node[1]] = node[3][0]
2055
        else:
2056
            for node in nodes:
2057
                result[node[1]] = None
2058
        return result
2059
4343.3.1 by John Arbash Meinel
Set 'supports_external_lookups=True' for dev6 repositories.
2060
    def get_missing_parents(self):
4343.3.21 by John Arbash Meinel
Implement get_missing_parents in terms of _KeyRefs.
2061
        """Return the keys of missing parents."""
2062
        # Copied from _KnitGraphIndex.get_missing_parents
2063
        # We may have false positives, so filter those out.
4634.29.6 by Andrew Bennetts
Put new key tracking in _KeyRefs rather than alongside it.
2064
        self._key_dependencies.satisfy_refs_for_keys(
4343.3.21 by John Arbash Meinel
Implement get_missing_parents in terms of _KeyRefs.
2065
            self.get_parent_map(self._key_dependencies.get_unsatisfied_refs()))
2066
        return frozenset(self._key_dependencies.get_unsatisfied_refs())
4343.3.1 by John Arbash Meinel
Set 'supports_external_lookups=True' for dev6 repositories.
2067
0.17.5 by Robert Collins
nograph tests completely passing.
2068
    def get_build_details(self, keys):
2069
        """Get the various build details for keys.
2070
2071
        Ghosts are omitted from the result.
2072
2073
        :param keys: An iterable of keys.
2074
        :return: A dict of key:
2075
            (index_memo, compression_parent, parents, record_details).
2076
            index_memo
2077
                opaque structure to pass to read_records to extract the raw
2078
                data
2079
            compression_parent
2080
                Content that this record is built upon, may be None
2081
            parents
2082
                Logical parents of this node
2083
            record_details
2084
                extra information about the content which needs to be passed to
2085
                Factory.parse_record
2086
        """
2087
        self._check_read()
2088
        result = {}
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
2089
        entries = self._get_entries(keys)
0.17.5 by Robert Collins
nograph tests completely passing.
2090
        for entry in entries:
2091
            key = entry[1]
2092
            if not self._parents:
2093
                parents = None
2094
            else:
2095
                parents = entry[3][0]
5365.4.1 by John Arbash Meinel
Find a case where we are wasting a bit of memory.
2096
            details = _GCBuildDetails(parents, self._node_to_position(entry))
2097
            result[key] = details
0.17.5 by Robert Collins
nograph tests completely passing.
2098
        return result
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
2099
0.17.5 by Robert Collins
nograph tests completely passing.
2100
    def keys(self):
2101
        """Get all the keys in the collection.
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
2102
0.17.5 by Robert Collins
nograph tests completely passing.
2103
        The keys are not ordered.
2104
        """
2105
        self._check_read()
2106
        return [node[1] for node in self._graph_index.iter_all_entries()]
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
2107
0.17.5 by Robert Collins
nograph tests completely passing.
2108
    def _node_to_position(self, node):
2109
        """Convert an index value to position details."""
2110
        bits = node[2].split(' ')
2111
        # It would be nice not to read the entire gzip.
4679.9.19 by John Arbash Meinel
Interning the start and stop group positions saves another 7MB peak mem. \o/
2112
        # start and stop are put into _int_cache because they are very common.
2113
        # They define the 'group' that an entry is in, and many groups can have
2114
        # thousands of objects.
2115
        # Branching Launchpad, for example, saves ~600k integers, at 12 bytes
2116
        # each, or about 7MB. Note that it might be even more when you consider
2117
        # how PyInt is allocated in separate slabs. And you can't return a slab
2118
        # to the OS if even 1 int on it is in use. Note though that Python uses
5365.4.1 by John Arbash Meinel
Find a case where we are wasting a bit of memory.
2119
        # a LIFO when re-using PyInt slots, which might cause more
4679.9.19 by John Arbash Meinel
Interning the start and stop group positions saves another 7MB peak mem. \o/
2120
        # fragmentation.
0.17.5 by Robert Collins
nograph tests completely passing.
2121
        start = int(bits[0])
4679.9.19 by John Arbash Meinel
Interning the start and stop group positions saves another 7MB peak mem. \o/
2122
        start = self._int_cache.setdefault(start, start)
0.17.5 by Robert Collins
nograph tests completely passing.
2123
        stop = int(bits[1])
4679.9.19 by John Arbash Meinel
Interning the start and stop group positions saves another 7MB peak mem. \o/
2124
        stop = self._int_cache.setdefault(stop, stop)
0.17.5 by Robert Collins
nograph tests completely passing.
2125
        basis_end = int(bits[2])
2126
        delta_end = int(bits[3])
4679.9.19 by John Arbash Meinel
Interning the start and stop group positions saves another 7MB peak mem. \o/
2127
        # We can't use StaticTuple here, because node[0] is a BTreeGraphIndex
2128
        # instance...
2129
        return (node[0], start, stop, basis_end, delta_end)
0.18.14 by John Arbash Meinel
A bit more work, not really usable yet.
2130
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
2131
    def scan_unvalidated_index(self, graph_index):
2132
        """Inform this _GCGraphIndex that there is an unvalidated index.
2133
2134
        This allows this _GCGraphIndex to keep track of any missing
2135
        compression parents we may want to have filled in to make those
4634.29.3 by Andrew Bennetts
Simplify further.
2136
        indices valid.  It also allows _GCGraphIndex to track any new keys.
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
2137
2138
        :param graph_index: A GraphIndex
2139
        """
4634.29.3 by Andrew Bennetts
Simplify further.
2140
        key_dependencies = self._key_dependencies
4634.29.6 by Andrew Bennetts
Put new key tracking in _KeyRefs rather than alongside it.
2141
        if key_dependencies is None:
4634.29.1 by Andrew Bennetts
Rough code to reject commit_write_group if any inventory's CHK root is absent.
2142
            return
2143
        for node in graph_index.iter_all_entries():
4634.29.6 by Andrew Bennetts
Put new key tracking in _KeyRefs rather than alongside it.
2144
            # Add parent refs from graph_index (and discard parent refs
2145
            # that the graph_index has).
2146
            key_dependencies.add_references(node[1], node[3][0])
4343.3.2 by John Arbash Meinel
All stacking tests seem to be passing for dev6 repos
2147
0.18.14 by John Arbash Meinel
A bit more work, not really usable yet.
2148
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
2149
from bzrlib._groupcompress_py import (
2150
    apply_delta,
3735.40.19 by John Arbash Meinel
Implement apply_delta_to_source which doesn't have to malloc another string.
2151
    apply_delta_to_source,
3735.40.11 by John Arbash Meinel
Implement make_delta and apply_delta.
2152
    encode_base128_int,
2153
    decode_base128_int,
4300.1.1 by John Arbash Meinel
Add the ability to convert a gc block into 'human readable' form.
2154
    decode_copy_instruction,
3735.40.13 by John Arbash Meinel
Rename EquivalenceTable to LinesDeltaIndex.
2155
    LinesDeltaIndex,
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
2156
    )
0.18.14 by John Arbash Meinel
A bit more work, not really usable yet.
2157
try:
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
2158
    from bzrlib._groupcompress_pyx import (
2159
        apply_delta,
3735.40.19 by John Arbash Meinel
Implement apply_delta_to_source which doesn't have to malloc another string.
2160
        apply_delta_to_source,
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
2161
        DeltaIndex,
3735.40.16 by John Arbash Meinel
Implement (de|en)code_base128_int in pyrex.
2162
        encode_base128_int,
2163
        decode_base128_int,
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
2164
        )
3735.40.2 by John Arbash Meinel
Add a groupcompress.encode_copy_instruction function.
2165
    GroupCompressor = PyrexGroupCompressor
4574.3.6 by Martin Pool
More warnings when failing to load extensions
2166
except ImportError, e:
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
2167
    osutils.failed_to_load_extension(e)
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
2168
    GroupCompressor = PythonGroupCompressor
2169