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