~bzr-pqm/bzr/bzr.dev

3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
1
# Copyright (C) 2008, 2009 Canonical Ltd
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
0.17.13 by Robert Collins
Do not output copy instructions which take more to encode than a fresh insert. (But do not refer to those insertions when finding ranges to copy: they are not interesting).
19
from itertools import izip
0.17.5 by Robert Collins
nograph tests completely passing.
20
from cStringIO import StringIO
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
21
import time
0.17.5 by Robert Collins
nograph tests completely passing.
22
import zlib
0.17.44 by John Arbash Meinel
Use the bit field to allow both lzma groups and zlib groups.
23
try:
24
    import pylzma
25
except ImportError:
26
    pylzma = None
0.17.5 by Robert Collins
nograph tests completely passing.
27
0.17.4 by Robert Collins
Annotate.
28
from bzrlib import (
29
    annotate,
0.17.5 by Robert Collins
nograph tests completely passing.
30
    debug,
0.17.4 by Robert Collins
Annotate.
31
    diff,
0.17.5 by Robert Collins
nograph tests completely passing.
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,
36
    patiencediff,
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
37
    trace,
0.17.4 by Robert Collins
Annotate.
38
    )
39
from bzrlib.graph import Graph
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
40
from bzrlib.knit import _DirectPackAccess
0.17.21 by Robert Collins
Update groupcompress to bzrlib 1.10.
41
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.
42
from bzrlib.lru_cache import LRUSizeCache
0.17.9 by Robert Collins
Initial stab at repository format support.
43
from bzrlib.tsort import topo_sort
0.17.2 by Robert Collins
Core proof of concept working.
44
from bzrlib.versionedfile import (
0.17.5 by Robert Collins
nograph tests completely passing.
45
    adapter_registry,
46
    AbsentContentFactory,
0.20.5 by John Arbash Meinel
Finish the Fulltext => Chunked conversions so that we work in the more-efficient Chunks.
47
    ChunkedContentFactory,
0.17.2 by Robert Collins
Core proof of concept working.
48
    FulltextContentFactory,
49
    VersionedFiles,
50
    )
51
0.17.44 by John Arbash Meinel
Use the bit field to allow both lzma groups and zlib groups.
52
_USE_LZMA = False and (pylzma is not None)
0.17.2 by Robert Collins
Core proof of concept working.
53
3735.2.162 by John Arbash Meinel
Change GroupCompressor.compress() to return the start_point.
54
# osutils.sha_string('')
55
_null_sha1 = 'da39a3ee5e6b4b0d3255bfef95601890afd80709'
56
57
0.20.11 by John Arbash Meinel
start experimenting with gc-optimal ordering.
58
def sort_gc_optimal(parent_map):
3735.31.14 by John Arbash Meinel
Change the gc-optimal to 'groupcompress'
59
    """Sort and group the keys in parent_map into groupcompress order.
0.20.11 by John Arbash Meinel
start experimenting with gc-optimal ordering.
60
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
61
    groupcompress is defined (currently) as reverse-topological order, grouped
62
    by the key prefix.
0.20.11 by John Arbash Meinel
start experimenting with gc-optimal ordering.
63
64
    :return: A sorted-list of keys
65
    """
3735.31.14 by John Arbash Meinel
Change the gc-optimal to 'groupcompress'
66
    # groupcompress ordering is approximately reverse topological,
0.20.11 by John Arbash Meinel
start experimenting with gc-optimal ordering.
67
    # properly grouped by file-id.
0.20.23 by John Arbash Meinel
Add a progress indicator for chk pages.
68
    per_prefix_map = {}
0.20.11 by John Arbash Meinel
start experimenting with gc-optimal ordering.
69
    for item in parent_map.iteritems():
70
        key = item[0]
71
        if isinstance(key, str) or len(key) == 1:
0.20.23 by John Arbash Meinel
Add a progress indicator for chk pages.
72
            prefix = ''
0.20.11 by John Arbash Meinel
start experimenting with gc-optimal ordering.
73
        else:
0.20.23 by John Arbash Meinel
Add a progress indicator for chk pages.
74
            prefix = key[0]
75
        try:
76
            per_prefix_map[prefix].append(item)
77
        except KeyError:
78
            per_prefix_map[prefix] = [item]
0.20.11 by John Arbash Meinel
start experimenting with gc-optimal ordering.
79
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
80
    present_keys = []
0.20.11 by John Arbash Meinel
start experimenting with gc-optimal ordering.
81
    for prefix in sorted(per_prefix_map):
82
        present_keys.extend(reversed(topo_sort(per_prefix_map[prefix])))
83
    return present_keys
84
85
3735.32.9 by John Arbash Meinel
Use a 32kB extension, since that is the max window size for zlib.
86
# The max zlib window size is 32kB, so if we set 'max_size' output of the
87
# decompressor to the requested bytes + 32kB, then we should guarantee
88
# num_bytes coming out.
89
_ZLIB_DECOMP_WINDOW = 32*1024
0.25.2 by John Arbash Meinel
First cut at meta-info as text form.
90
91
class GroupCompressBlock(object):
92
    """An object which maintains the internal structure of the compressed data.
93
94
    This tracks the meta info (start of text, length, type, etc.)
95
    """
96
0.25.5 by John Arbash Meinel
Now using a zlib compressed format.
97
    # Group Compress Block v1 Zlib
98
    GCB_HEADER = 'gcb1z\n'
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
99
    # Group Compress Block v1 Lzma
0.17.44 by John Arbash Meinel
Use the bit field to allow both lzma groups and zlib groups.
100
    GCB_LZ_HEADER = 'gcb1l\n'
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
101
    GCB_KNOWN_HEADERS = (GCB_HEADER, GCB_LZ_HEADER)
0.25.2 by John Arbash Meinel
First cut at meta-info as text form.
102
103
    def __init__(self):
104
        # map by key? or just order in file?
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
105
        self._compressor_name = None
3735.32.5 by John Arbash Meinel
Change the parsing code to start out just holding the compressed bytes.
106
        self._z_content = None
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
107
        self._z_content_decompressor = None
3735.32.5 by John Arbash Meinel
Change the parsing code to start out just holding the compressed bytes.
108
        self._z_content_length = None
109
        self._content_length = None
0.25.6 by John Arbash Meinel
(tests broken) implement the basic ability to have a separate header
110
        self._content = None
3735.32.5 by John Arbash Meinel
Change the parsing code to start out just holding the compressed bytes.
111
112
    def __len__(self):
3735.38.4 by John Arbash Meinel
Another disk format change.
113
        # This is the maximum number of bytes this object will reference if
114
        # everything is decompressed. However, if we decompress less than
115
        # everything... (this would cause some problems for LRUSizeCache)
116
        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.
117
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
118
    def _ensure_content(self, num_bytes=None):
119
        """Make sure that content has been expanded enough.
120
121
        :param num_bytes: Ensure that we have extracted at least num_bytes of
122
            content. If None, consume everything
123
        """
3735.32.15 by John Arbash Meinel
Change the GroupCompressBlock code to allow not recording 'end'.
124
        # TODO: If we re-use the same content block at different times during
125
        #       get_record_stream(), it is possible that the first pass will
126
        #       get inserted, triggering an extract/_ensure_content() which
127
        #       will get rid of _z_content. And then the next use of the block
128
        #       will try to access _z_content (to send it over the wire), and
129
        #       fail because it is already extracted. Consider never releasing
130
        #       _z_content because of this.
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
131
        if num_bytes is None:
132
            num_bytes = self._content_length
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
133
        elif (self._content_length is not None
134
              and num_bytes > self._content_length):
135
            raise AssertionError(
136
                'requested num_bytes (%d) > content length (%d)'
137
                % (num_bytes, self._content_length))
138
        # Expand the content if required
3735.32.6 by John Arbash Meinel
A bit of reworking changes things so content is expanded at extract() time.
139
        if self._content is None:
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
140
            if self._z_content is None:
141
                raise AssertionError('No content to decompress')
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
142
            if self._z_content == '':
143
                self._content = ''
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
144
            elif self._compressor_name == 'lzma':
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
145
                # We don't do partial lzma decomp yet
3735.2.160 by John Arbash Meinel
Fix a trivial typo
146
                self._content = pylzma.decompress(self._z_content)
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
147
            elif self._compressor_name == 'zlib':
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
148
                # Start a zlib decompressor
3735.32.27 by John Arbash Meinel
Have _LazyGroupContentManager pre-extract everything it holds.
149
                if num_bytes is None:
150
                    self._content = zlib.decompress(self._z_content)
151
                else:
152
                    self._z_content_decompressor = zlib.decompressobj()
153
                    # Seed the decompressor with the uncompressed bytes, so
154
                    # that the rest of the code is simplified
155
                    self._content = self._z_content_decompressor.decompress(
156
                        self._z_content, num_bytes + _ZLIB_DECOMP_WINDOW)
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
157
            else:
3735.2.182 by Matt Nordhoff
Improve an assertion message slightly, and fix typos in 2 others
158
                raise AssertionError('Unknown compressor: %r'
3735.2.183 by John Arbash Meinel
Fix the compressor name.
159
                                     % self._compressor_name)
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
160
        # Any bytes remaining to be decompressed will be in the decompressors
161
        # 'unconsumed_tail'
162
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
163
        # Do we have enough bytes already?
3735.32.11 by John Arbash Meinel
Add tests for the ability to do partial decompression without knowing the final length.
164
        if num_bytes is not None and len(self._content) >= num_bytes:
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
165
            return
3735.32.27 by John Arbash Meinel
Have _LazyGroupContentManager pre-extract everything it holds.
166
        if num_bytes is None and self._z_content_decompressor is None:
167
            # We must have already decompressed everything
168
            return
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
169
        # 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.
170
        if self._z_content_decompressor is None:
171
            raise AssertionError(
3735.2.182 by Matt Nordhoff
Improve an assertion message slightly, and fix typos in 2 others
172
                'No decompressor to decompress %d bytes' % num_bytes)
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
173
        remaining_decomp = self._z_content_decompressor.unconsumed_tail
3735.32.11 by John Arbash Meinel
Add tests for the ability to do partial decompression without knowing the final length.
174
        if num_bytes is None:
175
            if remaining_decomp:
176
                # We don't know how much is left, but we'll decompress it all
177
                self._content += self._z_content_decompressor.decompress(
178
                    remaining_decomp)
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
179
                # Note: There's what I consider a bug in zlib.decompressobj
3735.32.11 by John Arbash Meinel
Add tests for the ability to do partial decompression without knowing the final length.
180
                #       If you pass back in the entire unconsumed_tail, only
181
                #       this time you don't pass a max-size, it doesn't
182
                #       change the unconsumed_tail back to None/''.
183
                #       However, we know we are done with the whole stream
184
                self._z_content_decompressor = None
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
185
            # XXX: Why is this the only place in this routine we set this?
3735.32.11 by John Arbash Meinel
Add tests for the ability to do partial decompression without knowing the final length.
186
            self._content_length = len(self._content)
187
        else:
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
188
            if not remaining_decomp:
189
                raise AssertionError('Nothing left to decompress')
3735.32.11 by John Arbash Meinel
Add tests for the ability to do partial decompression without knowing the final length.
190
            needed_bytes = num_bytes - len(self._content)
3735.32.12 by John Arbash Meinel
Add groupcompress-block[-ref] as valid stream types.
191
            # We always set max_size to 32kB over the minimum needed, so that
192
            # zlib will give us as much as we really want.
193
            # TODO: If this isn't good enough, we could make a loop here,
194
            #       that keeps expanding the request until we get enough
3735.32.11 by John Arbash Meinel
Add tests for the ability to do partial decompression without knowing the final length.
195
            self._content += self._z_content_decompressor.decompress(
196
                remaining_decomp, needed_bytes + _ZLIB_DECOMP_WINDOW)
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
197
            if len(self._content) < num_bytes:
198
                raise AssertionError('%d bytes wanted, only %d available'
199
                                     % (num_bytes, len(self._content)))
3735.32.11 by John Arbash Meinel
Add tests for the ability to do partial decompression without knowing the final length.
200
            if not self._z_content_decompressor.unconsumed_tail:
201
                # The stream is finished
202
                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.
203
3735.38.4 by John Arbash Meinel
Another disk format change.
204
    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.
205
        """Read the various lengths from the header.
206
207
        This also populates the various 'compressed' buffers.
208
209
        :return: The position in bytes just after the last newline
210
        """
3735.38.4 by John Arbash Meinel
Another disk format change.
211
        # At present, we have 2 integers for the compressed and uncompressed
212
        # content. In base10 (ascii) 14 bytes can represent > 1TB, so to avoid
213
        # checking too far, cap the search to 14 bytes.
214
        pos2 = bytes.index('\n', pos, pos + 14)
215
        self._z_content_length = int(bytes[pos:pos2])
216
        pos = pos2 + 1
217
        pos2 = bytes.index('\n', pos, pos + 14)
218
        self._content_length = int(bytes[pos:pos2])
219
        pos = pos2 + 1
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
220
        if len(bytes) != (pos + self._z_content_length):
221
            # XXX: Define some GCCorrupt error ?
222
            raise AssertionError('Invalid bytes: (%d) != %d + %d' %
223
                                 (len(bytes), pos, self._z_content_length))
3735.38.4 by John Arbash Meinel
Another disk format change.
224
        self._z_content = bytes[pos:]
3735.32.5 by John Arbash Meinel
Change the parsing code to start out just holding the compressed bytes.
225
0.25.2 by John Arbash Meinel
First cut at meta-info as text form.
226
    @classmethod
227
    def from_bytes(cls, bytes):
228
        out = cls()
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
229
        if bytes[:6] not in cls.GCB_KNOWN_HEADERS:
230
            raise ValueError('bytes did not start with any of %r'
231
                             % (cls.GCB_KNOWN_HEADERS,))
232
        # 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.
233
        if bytes[4] == 'z':
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
234
            out._compressor_name = 'zlib'
0.17.45 by John Arbash Meinel
Just make sure we have the right decompressor
235
        elif bytes[4] == 'l':
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
236
            out._compressor_name = 'lzma'
0.17.45 by John Arbash Meinel
Just make sure we have the right decompressor
237
        else:
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
238
            raise ValueError('unknown compressor: %r' % (bytes,))
3735.38.4 by John Arbash Meinel
Another disk format change.
239
        out._parse_bytes(bytes, 6)
0.25.2 by John Arbash Meinel
First cut at meta-info as text form.
240
        return out
241
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
242
    def extract(self, key, start, end, sha1=None):
0.25.2 by John Arbash Meinel
First cut at meta-info as text form.
243
        """Extract the text for a specific key.
244
245
        :param key: The label used for this content
246
        :param sha1: TODO (should we validate only when sha1 is supplied?)
247
        :return: The bytes for the content
248
        """
3735.34.1 by John Arbash Meinel
Some testing to see if we can decrease the peak memory consumption a bit.
249
        if start == end == 0:
3735.2.158 by John Arbash Meinel
Remove support for passing None for end in GroupCompressBlock.extract.
250
            return ''
251
        self._ensure_content(end)
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
252
        # The bytes are 'f' or 'd' for the type, then a variable-length
253
        # 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'.
254
        # We know that the variable-length integer won't be longer than 5
255
        # bytes (it takes 5 bytes to encode 2^32)
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
256
        c = self._content[start]
257
        if c == 'f':
258
            type = 'fulltext'
0.17.36 by John Arbash Meinel
Adding a mini-len to the delta/fulltext bytes
259
        else:
3735.32.7 by John Arbash Meinel
Implement partial decompression support.
260
            if c != 'd':
261
                raise ValueError('Unknown content control code: %s'
262
                                 % (c,))
263
            type = 'delta'
3735.32.15 by John Arbash Meinel
Change the GroupCompressBlock code to allow not recording 'end'.
264
        content_len, len_len = decode_base128_int(
265
                            self._content[start + 1:start + 6])
266
        content_start = start + 1 + len_len
3735.2.158 by John Arbash Meinel
Remove support for passing None for end in GroupCompressBlock.extract.
267
        if end != content_start + content_len:
268
            raise ValueError('end != len according to field header'
269
                ' %s != %s' % (end, content_start + content_len))
0.17.36 by John Arbash Meinel
Adding a mini-len to the delta/fulltext bytes
270
        if c == 'f':
3735.40.19 by John Arbash Meinel
Implement apply_delta_to_source which doesn't have to malloc another string.
271
            bytes = self._content[content_start:end]
0.17.36 by John Arbash Meinel
Adding a mini-len to the delta/fulltext bytes
272
        elif c == 'd':
3735.40.19 by John Arbash Meinel
Implement apply_delta_to_source which doesn't have to malloc another string.
273
            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.
274
        return bytes
0.25.2 by John Arbash Meinel
First cut at meta-info as text form.
275
3735.32.17 by John Arbash Meinel
We now round-trip the wire_bytes.
276
    def set_content(self, content):
277
        """Set the content of this block."""
278
        self._content_length = len(content)
279
        self._content = content
280
        self._z_content = None
281
282
    def to_bytes(self):
0.25.2 by John Arbash Meinel
First cut at meta-info as text form.
283
        """Encode the information into a byte stream."""
0.17.44 by John Arbash Meinel
Use the bit field to allow both lzma groups and zlib groups.
284
        compress = zlib.compress
285
        if _USE_LZMA:
286
            compress = pylzma.compress
3735.38.4 by John Arbash Meinel
Another disk format change.
287
        if self._z_content is None:
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
288
            if self._content is None:
289
                raise AssertionError('Nothing to compress')
3735.38.4 by John Arbash Meinel
Another disk format change.
290
            self._z_content = compress(self._content)
291
            self._z_content_length = len(self._z_content)
0.17.46 by John Arbash Meinel
Set the proper header when using/not using lzma
292
        if _USE_LZMA:
293
            header = self.GCB_LZ_HEADER
294
        else:
295
            header = self.GCB_HEADER
296
        chunks = [header,
3735.38.4 by John Arbash Meinel
Another disk format change.
297
                  '%d\n%d\n' % (self._z_content_length, self._content_length),
298
                  self._z_content,
0.25.7 by John Arbash Meinel
Have the GroupCompressBlock decide how to compress the header and content.
299
                 ]
0.25.2 by John Arbash Meinel
First cut at meta-info as text form.
300
        return ''.join(chunks)
301
302
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
303
class _LazyGroupCompressFactory(object):
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
304
    """Yield content from a GroupCompressBlock on demand."""
305
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
306
    def __init__(self, key, parents, manager, start, end, first):
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
307
        """Create a _LazyGroupCompressFactory
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
308
309
        :param key: The key of just this record
310
        :param parents: The parents of this key (possibly None)
311
        :param gc_block: A GroupCompressBlock object
312
        :param start: Offset of the first byte for this record in the
313
            uncompressd content
314
        :param end: Offset of the byte just after the end of this record
315
            (ie, bytes = content[start:end])
316
        :param first: Is this the first Factory for the given block?
317
        """
318
        self.key = key
319
        self.parents = parents
320
        self.sha1 = None
3735.32.15 by John Arbash Meinel
Change the GroupCompressBlock code to allow not recording 'end'.
321
        # Note: This attribute coupled with Manager._factories creates a
322
        #       reference cycle. Perhaps we would rather use a weakref(), or
323
        #       find an appropriate time to release the ref. After the first
324
        #       get_bytes_as call? After Manager.get_record_stream() returns
325
        #       the object?
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
326
        self._manager = manager
3735.34.1 by John Arbash Meinel
Some testing to see if we can decrease the peak memory consumption a bit.
327
        self._bytes = None
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
328
        self.storage_kind = 'groupcompress-block'
329
        if not first:
330
            self.storage_kind = 'groupcompress-block-ref'
331
        self._first = first
332
        self._start = start
333
        self._end = end
334
3735.32.12 by John Arbash Meinel
Add groupcompress-block[-ref] as valid stream types.
335
    def __repr__(self):
336
        return '%s(%s, first=%s)' % (self.__class__.__name__,
337
            self.key, self._first)
338
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
339
    def get_bytes_as(self, storage_kind):
340
        if storage_kind == self.storage_kind:
341
            if self._first:
342
                # wire bytes, something...
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
343
                return self._manager._wire_bytes()
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
344
            else:
345
                return ''
346
        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.
347
            if self._bytes is None:
3735.34.3 by John Arbash Meinel
Cleanup, in preparation for merging to brisbane-core.
348
                # Grab and cache the raw bytes for this entry
349
                # and break the ref-cycle with _manager since we don't need it
350
                # anymore
3735.34.1 by John Arbash Meinel
Some testing to see if we can decrease the peak memory consumption a bit.
351
                self._manager._prepare_for_extract()
352
                block = self._manager._block
3735.34.2 by John Arbash Meinel
Merge brisbane-core tip, resolve differences.
353
                self._bytes = block.extract(self.key, self._start, self._end)
3735.37.5 by John Arbash Meinel
Restore the refcycle reduction code.
354
                # There are code paths that first extract as fulltext, and then
355
                # extract as storage_kind (smart fetch). So we don't break the
356
                # refcycle here, but instead in manager.get_record_stream()
3735.2.163 by John Arbash Meinel
Merge bzr.dev 4187, and revert the change to fix refcycle issues.
357
                # self._manager = None
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
358
            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.
359
                return self._bytes
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
360
            else:
3735.34.1 by John Arbash Meinel
Some testing to see if we can decrease the peak memory consumption a bit.
361
                return [self._bytes]
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
362
        raise errors.UnavailableRepresentation(self.key, storage_kind,
3735.34.3 by John Arbash Meinel
Cleanup, in preparation for merging to brisbane-core.
363
                                               self.storage_kind)
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
364
365
3735.32.17 by John Arbash Meinel
We now round-trip the wire_bytes.
366
class _LazyGroupContentManager(object):
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
367
    """This manages a group of _LazyGroupCompressFactory objects."""
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
368
369
    def __init__(self, block):
370
        self._block = block
371
        # We need to preserve the ordering
372
        self._factories = []
3735.32.27 by John Arbash Meinel
Have _LazyGroupContentManager pre-extract everything it holds.
373
        self._last_byte = 0
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
374
375
    def add_factory(self, key, parents, start, end):
376
        if not self._factories:
377
            first = True
378
        else:
379
            first = False
380
        # Note that this creates a reference cycle....
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
381
        factory = _LazyGroupCompressFactory(key, parents, self,
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
382
            start, end, first=first)
3735.36.13 by John Arbash Meinel
max() shows up under lsprof as more expensive than creating an object.
383
        # max() works here, but as a function call, doing a compare seems to be
384
        # significantly faster, timeit says 250ms for max() and 100ms for the
385
        # comparison
386
        if end > self._last_byte:
387
            self._last_byte = end
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
388
        self._factories.append(factory)
389
390
    def get_record_stream(self):
391
        """Get a record for all keys added so far."""
392
        for factory in self._factories:
393
            yield factory
3735.34.3 by John Arbash Meinel
Cleanup, in preparation for merging to brisbane-core.
394
            # Break the ref-cycle
3735.34.2 by John Arbash Meinel
Merge brisbane-core tip, resolve differences.
395
            factory._bytes = None
3735.37.5 by John Arbash Meinel
Restore the refcycle reduction code.
396
            factory._manager = None
3735.32.15 by John Arbash Meinel
Change the GroupCompressBlock code to allow not recording 'end'.
397
        # TODO: Consider setting self._factories = None after the above loop,
398
        #       as it will break the reference cycle
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
399
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
400
    def _trim_block(self, last_byte):
401
        """Create a new GroupCompressBlock, with just some of the content."""
402
        # None of the factories need to be adjusted, because the content is
403
        # located in an identical place. Just that some of the unreferenced
404
        # trailing bytes are stripped
405
        trace.mutter('stripping trailing bytes from groupcompress block'
406
                     ' %d => %d', self._block._content_length, last_byte)
407
        new_block = GroupCompressBlock()
408
        self._block._ensure_content(last_byte)
409
        new_block.set_content(self._block._content[:last_byte])
410
        self._block = new_block
411
412
    def _rebuild_block(self):
413
        """Create a new GroupCompressBlock with only the referenced texts."""
414
        compressor = GroupCompressor()
415
        tstart = time.time()
416
        old_length = self._block._content_length
3735.2.162 by John Arbash Meinel
Change GroupCompressor.compress() to return the start_point.
417
        end_point = 0
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
418
        for factory in self._factories:
419
            bytes = factory.get_bytes_as('fulltext')
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
420
            (found_sha1, start_point, end_point,
421
             type) = compressor.compress(factory.key, bytes, factory.sha1)
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
422
            # Now update this factory with the new offsets, etc
423
            factory.sha1 = found_sha1
3735.2.162 by John Arbash Meinel
Change GroupCompressor.compress() to return the start_point.
424
            factory._start = start_point
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
425
            factory._end = end_point
3735.2.162 by John Arbash Meinel
Change GroupCompressor.compress() to return the start_point.
426
        self._last_byte = end_point
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
427
        new_block = compressor.flush()
428
        # TODO: Should we check that new_block really *is* smaller than the old
429
        #       block? It seems hard to come up with a method that it would
430
        #       expand, since we do full compression again. Perhaps based on a
431
        #       request that ends up poorly ordered?
432
        delta = time.time() - tstart
433
        self._block = new_block
434
        trace.mutter('creating new compressed block on-the-fly in %.3fs'
435
                     ' %d bytes => %d bytes', delta, old_length,
436
                     self._block._content_length)
437
3735.32.27 by John Arbash Meinel
Have _LazyGroupContentManager pre-extract everything it holds.
438
    def _prepare_for_extract(self):
439
        """A _LazyGroupCompressFactory is about to extract to fulltext."""
440
        # We expect that if one child is going to fulltext, all will be. This
441
        # helps prevent all of them from extracting a small amount at a time.
442
        # Which in itself isn't terribly expensive, but resizing 2MB 32kB at a
443
        # time (self._block._content) is a little expensive.
444
        self._block._ensure_content(self._last_byte)
445
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
446
    def _check_rebuild_block(self):
447
        """Check to see if our block should be repacked."""
448
        total_bytes_used = 0
449
        last_byte_used = 0
450
        for factory in self._factories:
451
            total_bytes_used += factory._end - factory._start
452
            last_byte_used = max(last_byte_used, factory._end)
453
        # If we are using most of the bytes from the block, we have nothing
454
        # else to check (currently more that 1/2)
455
        if total_bytes_used * 2 >= self._block._content_length:
456
            return
457
        # Can we just strip off the trailing bytes? If we are going to be
458
        # transmitting more than 50% of the front of the content, go ahead
459
        if total_bytes_used * 2 > last_byte_used:
460
            self._trim_block(last_byte_used)
461
            return
462
463
        # We are using a small amount of the data, and it isn't just packed
464
        # nicely at the front, so rebuild the content.
465
        # Note: This would be *nicer* as a strip-data-from-group, rather than
466
        #       building it up again from scratch
467
        #       It might be reasonable to consider the fulltext sizes for
468
        #       different bits when deciding this, too. As you may have a small
469
        #       fulltext, and a trivial delta, and you are just trading around
470
        #       for another fulltext. If we do a simple 'prune' you may end up
471
        #       expanding many deltas into fulltexts, as well.
472
        #       If we build a cheap enough 'strip', then we could try a strip,
473
        #       if that expands the content, we then rebuild.
474
        self._rebuild_block()
475
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
476
    def _wire_bytes(self):
477
        """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
478
        self._check_rebuild_block()
3735.32.16 by John Arbash Meinel
We now have a general header for the GC block.
479
        # The outer block starts with:
480
        #   'groupcompress-block\n'
481
        #   <length of compressed key info>\n
482
        #   <length of uncompressed info>\n
483
        #   <length of gc block>\n
484
        #   <header bytes>
485
        #   <gc-block>
486
        lines = ['groupcompress-block\n']
487
        # The minimal info we need is the key, the start offset, and the
488
        # parents. The length and type are encoded in the record itself.
489
        # However, passing in the other bits makes it easier.  The list of
490
        # keys, and the start offset, the length
491
        # 1 line key
492
        # 1 line with parents, '' for ()
493
        # 1 line for start offset
494
        # 1 line for end byte
495
        header_lines = []
3735.32.15 by John Arbash Meinel
Change the GroupCompressBlock code to allow not recording 'end'.
496
        for factory in self._factories:
3735.32.16 by John Arbash Meinel
We now have a general header for the GC block.
497
            key_bytes = '\x00'.join(factory.key)
498
            parents = factory.parents
499
            if parents is None:
500
                parent_bytes = 'None:'
501
            else:
502
                parent_bytes = '\t'.join('\x00'.join(key) for key in parents)
503
            record_header = '%s\n%s\n%d\n%d\n' % (
504
                key_bytes, parent_bytes, factory._start, factory._end)
505
            header_lines.append(record_header)
3735.37.5 by John Arbash Meinel
Restore the refcycle reduction code.
506
            # TODO: Can we break the refcycle at this point and set
507
            #       factory._manager = None?
3735.32.16 by John Arbash Meinel
We now have a general header for the GC block.
508
        header_bytes = ''.join(header_lines)
509
        del header_lines
510
        header_bytes_len = len(header_bytes)
511
        z_header_bytes = zlib.compress(header_bytes)
512
        del header_bytes
513
        z_header_bytes_len = len(z_header_bytes)
3735.32.17 by John Arbash Meinel
We now round-trip the wire_bytes.
514
        block_bytes = self._block.to_bytes()
3735.32.16 by John Arbash Meinel
We now have a general header for the GC block.
515
        lines.append('%d\n%d\n%d\n' % (z_header_bytes_len, header_bytes_len,
3735.32.17 by John Arbash Meinel
We now round-trip the wire_bytes.
516
                                       len(block_bytes)))
3735.32.16 by John Arbash Meinel
We now have a general header for the GC block.
517
        lines.append(z_header_bytes)
3735.32.17 by John Arbash Meinel
We now round-trip the wire_bytes.
518
        lines.append(block_bytes)
519
        del z_header_bytes, block_bytes
3735.32.16 by John Arbash Meinel
We now have a general header for the GC block.
520
        return ''.join(lines)
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
521
3735.32.17 by John Arbash Meinel
We now round-trip the wire_bytes.
522
    @classmethod
3735.32.18 by John Arbash Meinel
We now support generating a network stream.
523
    def from_bytes(cls, bytes):
3735.32.17 by John Arbash Meinel
We now round-trip the wire_bytes.
524
        # TODO: This does extra string copying, probably better to do it a
525
        #       different way
526
        (storage_kind, z_header_len, header_len,
527
         block_len, rest) = bytes.split('\n', 4)
528
        del bytes
529
        if storage_kind != 'groupcompress-block':
530
            raise ValueError('Unknown storage kind: %s' % (storage_kind,))
531
        z_header_len = int(z_header_len)
532
        if len(rest) < z_header_len:
533
            raise ValueError('Compressed header len shorter than all bytes')
534
        z_header = rest[:z_header_len]
535
        header_len = int(header_len)
536
        header = zlib.decompress(z_header)
537
        if len(header) != header_len:
538
            raise ValueError('invalid length for decompressed bytes')
539
        del z_header
540
        block_len = int(block_len)
541
        if len(rest) != z_header_len + block_len:
542
            raise ValueError('Invalid length for block')
543
        block_bytes = rest[z_header_len:]
544
        del rest
545
        # So now we have a valid GCB, we just need to parse the factories that
546
        # were sent to us
547
        header_lines = header.split('\n')
548
        del header
549
        last = header_lines.pop()
550
        if last != '':
551
            raise ValueError('header lines did not end with a trailing'
552
                             ' newline')
553
        if len(header_lines) % 4 != 0:
554
            raise ValueError('The header was not an even multiple of 4 lines')
555
        block = GroupCompressBlock.from_bytes(block_bytes)
556
        del block_bytes
557
        result = cls(block)
558
        for start in xrange(0, len(header_lines), 4):
559
            # intern()?
560
            key = tuple(header_lines[start].split('\x00'))
561
            parents_line = header_lines[start+1]
562
            if parents_line == 'None:':
563
                parents = None
564
            else:
565
                parents = tuple([tuple(segment.split('\x00'))
566
                                 for segment in parents_line.split('\t')
567
                                  if segment])
568
            start_offset = int(header_lines[start+2])
569
            end_offset = int(header_lines[start+3])
570
            result.add_factory(key, parents, start_offset, end_offset)
571
        return result
572
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
573
3735.32.18 by John Arbash Meinel
We now support generating a network stream.
574
def network_block_to_records(storage_kind, bytes, line_end):
575
    if storage_kind != 'groupcompress-block':
576
        raise ValueError('Unknown storage kind: %s' % (storage_kind,))
577
    manager = _LazyGroupContentManager.from_bytes(bytes)
578
    return manager.get_record_stream()
579
580
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
581
class _CommonGroupCompressor(object):
582
583
    def __init__(self):
584
        """Create a GroupCompressor."""
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
585
        self.chunks = []
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
586
        self._last = None
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
587
        self.endpoint = 0
588
        self.input_bytes = 0
589
        self.labels_deltas = {}
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
590
        self._delta_index = None # Set by the children
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
591
        self._block = GroupCompressBlock()
592
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
593
    def compress(self, key, bytes, expected_sha, nostore_sha=None, soft=False):
594
        """Compress lines with label key.
595
596
        :param key: A key tuple. It is stored in the output
597
            for identification of the text during decompression. If the last
598
            element is 'None' it is replaced with the sha1 of the text -
599
            e.g. sha1:xxxxxxx.
600
        :param bytes: The bytes to be compressed
601
        :param expected_sha: If non-None, the sha the lines are believed to
602
            have. During compression the sha is calculated; a mismatch will
603
            cause an error.
604
        :param nostore_sha: If the computed sha1 sum matches, we will raise
605
            ExistingContent rather than adding the text.
606
        :param soft: Do a 'soft' compression. This means that we require larger
607
            ranges to match to be considered for a copy command.
608
609
        :return: The sha1 of lines, the start and end offsets in the delta, and
610
            the type ('fulltext' or 'delta').
611
612
        :seealso VersionedFiles.add_lines:
613
        """
614
        if not bytes: # empty, like a dir entry, etc
615
            if nostore_sha == _null_sha1:
616
                raise errors.ExistingContent()
617
            return _null_sha1, 0, 0, 'fulltext'
618
        # we assume someone knew what they were doing when they passed it in
619
        if expected_sha is not None:
620
            sha1 = expected_sha
621
        else:
622
            sha1 = osutils.sha_string(bytes)
623
        if nostore_sha is not None:
624
            if sha1 == nostore_sha:
625
                raise errors.ExistingContent()
626
        if key[-1] is None:
627
            key = key[:-1] + ('sha1:' + sha1,)
628
629
        start, end, type = self._compress(key, bytes, len(bytes) / 2, soft)
630
        return sha1, start, end, type
631
632
    def _compress(self, key, bytes, max_delta_size, soft=False):
633
        """Compress lines with label key.
634
635
        :param key: A key tuple. It is stored in the output for identification
636
            of the text during decompression.
637
638
        :param bytes: The bytes to be compressed
639
640
        :param max_delta_size: The size above which we issue a fulltext instead
641
            of a delta.
642
643
        :param soft: Do a 'soft' compression. This means that we require larger
644
            ranges to match to be considered for a copy command.
645
646
        :return: The sha1 of lines, the start and end offsets in the delta, and
647
            the type ('fulltext' or 'delta').
648
        """
649
        raise NotImplementedError(self._compress)
650
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
651
    def extract(self, key):
652
        """Extract a key previously added to the compressor.
653
654
        :param key: The key to extract.
655
        :return: An iterable over bytes and the sha1.
656
        """
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
657
        (start_byte, start_chunk, end_byte, end_chunk) = self.labels_deltas[key]
658
        delta_chunks = self.chunks[start_chunk:end_chunk]
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
659
        stored_bytes = ''.join(delta_chunks)
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
660
        if stored_bytes[0] == 'f':
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
661
            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.
662
            data_len = fulltext_len + 1 + offset
663
            if  data_len != len(stored_bytes):
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
664
                raise ValueError('Index claimed fulltext len, but stored bytes'
665
                                 ' claim %s != %s'
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
666
                                 % (len(stored_bytes), data_len))
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
667
            bytes = stored_bytes[offset + 1:]
668
        else:
669
            # XXX: This is inefficient at best
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
670
            source = ''.join(self.chunks[:start_chunk])
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
671
            if stored_bytes[0] != 'd':
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
672
                raise ValueError('Unknown content kind, bytes claim %s'
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
673
                                 % (stored_bytes[0],))
674
            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.
675
            data_len = delta_len + 1 + offset
676
            if data_len != len(stored_bytes):
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
677
                raise ValueError('Index claimed delta len, but stored bytes'
678
                                 ' claim %s != %s'
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
679
                                 % (len(stored_bytes), data_len))
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
680
            bytes = apply_delta(source, stored_bytes[offset + 1:])
681
        bytes_sha1 = osutils.sha_string(bytes)
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
682
        return bytes, bytes_sha1
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
683
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
684
    def flush(self):
685
        """Finish this group, creating a formatted stream.
686
687
        After calling this, the compressor should no longer be used
688
        """
689
        content = ''.join(self.chunks)
690
        self.chunks = None
691
        self._delta_index = None
692
        self._block.set_content(content)
693
        return self._block
694
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
695
    def pop_last(self):
696
        """Call this if you want to 'revoke' the last compression.
697
698
        After this, the data structures will be rolled back, but you cannot do
699
        more compression.
700
        """
701
        self._delta_index = None
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
702
        del self.chunks[self._last[0]:]
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
703
        self.endpoint = self._last[1]
704
        self._last = None
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
705
706
    def ratio(self):
707
        """Return the overall compression ratio."""
708
        return float(self.input_bytes) / float(self.endpoint)
709
710
711
class PythonGroupCompressor(_CommonGroupCompressor):
712
3735.40.2 by John Arbash Meinel
Add a groupcompress.encode_copy_instruction function.
713
    def __init__(self):
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
714
        """Create a GroupCompressor.
715
716
        Used only if the pyrex version is not available.
717
        """
718
        super(PythonGroupCompressor, self).__init__()
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
719
        self._delta_index = LinesDeltaIndex([])
720
        # The actual content is managed by LinesDeltaIndex
721
        self.chunks = self._delta_index.lines
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
722
723
    def _compress(self, key, bytes, max_delta_size, soft=False):
724
        """see _CommonGroupCompressor._compress"""
725
        input_len = len(bytes)
3735.40.2 by John Arbash Meinel
Add a groupcompress.encode_copy_instruction function.
726
        new_lines = osutils.split_lines(bytes)
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
727
        out_lines, index_lines = self._delta_index.make_delta(
728
            new_lines, bytes_length=input_len, soft=soft)
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
729
        delta_length = sum(map(len, out_lines))
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
730
        if delta_length > max_delta_size:
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
731
            # The delta is longer than the fulltext, insert a fulltext
732
            type = 'fulltext'
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
733
            out_lines = ['f', encode_base128_int(input_len)]
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
734
            out_lines.extend(new_lines)
735
            index_lines = [False, False]
736
            index_lines.extend([True] * len(new_lines))
737
        else:
738
            # this is a worthy delta, output it
739
            type = 'delta'
740
            out_lines[0] = 'd'
741
            # Update the delta_length to include those two encoded integers
742
            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.
743
        # Before insertion
744
        start = self.endpoint
745
        chunk_start = len(self.chunks)
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
746
        self._delta_index.extend_lines(out_lines, index_lines)
747
        self.endpoint = self._delta_index.endpoint
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
748
        self.input_bytes += input_len
749
        chunk_end = len(self.chunks)
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
750
        self.labels_deltas[key] = (start, chunk_start,
751
                                   self.endpoint, chunk_end)
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
752
        return start, self.endpoint, type
753
754
755
class PyrexGroupCompressor(_CommonGroupCompressor):
0.17.3 by Robert Collins
new encoder, allows non monotonically increasing sequence matches for moar compression.
756
    """Produce a serialised group of compressed texts.
0.23.6 by John Arbash Meinel
Start stripping out the actual GroupCompressor
757
0.17.3 by Robert Collins
new encoder, allows non monotonically increasing sequence matches for moar compression.
758
    It contains code very similar to SequenceMatcher because of having a similar
759
    task. However some key differences apply:
760
     - there is no junk, we want a minimal edit not a human readable diff.
761
     - we don't filter very common lines (because we don't know where a good
762
       range will start, and after the first text we want to be emitting minmal
763
       edits only.
764
     - we chain the left side, not the right side
765
     - we incrementally update the adjacency matrix as new lines are provided.
766
     - we look for matches in all of the left side, so the routine which does
767
       the analagous task of find_longest_match does not need to filter on the
768
       left side.
769
    """
0.17.2 by Robert Collins
Core proof of concept working.
770
3735.32.19 by John Arbash Meinel
Get rid of the 'delta' flag to GroupCompressor. It didn't do anything anyway.
771
    def __init__(self):
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
772
        super(PyrexGroupCompressor, self).__init__()
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
773
        self._delta_index = DeltaIndex()
0.23.6 by John Arbash Meinel
Start stripping out the actual GroupCompressor
774
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
775
    def _compress(self, key, bytes, max_delta_size, soft=False):
776
        """see _CommonGroupCompressor._compress"""
0.23.52 by John Arbash Meinel
Use the max_delta flag.
777
        input_len = len(bytes)
0.23.12 by John Arbash Meinel
Add a 'len:' field to the data.
778
        # By having action/label/sha1/len, we can parse the group if the index
779
        # was ever destroyed, we have the key in 'label', we know the final
780
        # bytes are valid from sha1, and we know where to find the end of this
781
        # record because of 'len'. (the delta record itself will store the
782
        # total length for the expanded record)
0.23.13 by John Arbash Meinel
Factor out the ability to have/not have labels.
783
        # 'len: %d\n' costs approximately 1% increase in total data
784
        # Having the labels at all costs us 9-10% increase, 38% increase for
785
        # 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
786
        # 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.
787
        if self._delta_index._source_offset != self.endpoint:
788
            raise AssertionError('_source_offset != endpoint'
789
                ' somehow the DeltaIndex got out of sync with'
790
                ' the output lines')
0.23.52 by John Arbash Meinel
Use the max_delta flag.
791
        delta = self._delta_index.make_delta(bytes, max_delta_size)
792
        if (delta is None):
0.25.10 by John Arbash Meinel
Play around with detecting compression breaks.
793
            type = 'fulltext'
0.17.36 by John Arbash Meinel
Adding a mini-len to the delta/fulltext bytes
794
            enc_length = encode_base128_int(len(bytes))
795
            len_mini_header = 1 + len(enc_length)
796
            self._delta_index.add_source(bytes, len_mini_header)
797
            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.
798
        else:
0.25.10 by John Arbash Meinel
Play around with detecting compression breaks.
799
            type = 'delta'
0.17.36 by John Arbash Meinel
Adding a mini-len to the delta/fulltext bytes
800
            enc_length = encode_base128_int(len(delta))
801
            len_mini_header = 1 + len(enc_length)
802
            new_chunks = ['d', enc_length, delta]
3735.38.5 by John Arbash Meinel
A bit of testing showed that _FAST=True was actually *slower*.
803
            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.
804
        # Before insertion
805
        start = self.endpoint
806
        chunk_start = len(self.chunks)
807
        # Now output these bytes
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
808
        self._output_chunks(new_chunks)
0.23.6 by John Arbash Meinel
Start stripping out the actual GroupCompressor
809
        self.input_bytes += input_len
3735.40.18 by John Arbash Meinel
Get rid of the entries dict in GroupCompressBlock.
810
        chunk_end = len(self.chunks)
811
        self.labels_deltas[key] = (start, chunk_start,
812
                                   self.endpoint, chunk_end)
0.23.29 by John Arbash Meinel
Forgot to add the delta bytes to the index objects.
813
        if not self._delta_index._source_offset == self.endpoint:
814
            raise AssertionError('the delta index is out of sync'
815
                'with the output lines %s != %s'
816
                % (self._delta_index._source_offset, self.endpoint))
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
817
        return start, self.endpoint, type
0.17.2 by Robert Collins
Core proof of concept working.
818
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
819
    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.
820
        """Output some chunks.
821
822
        :param new_chunks: The chunks to output.
823
        """
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
824
        self._last = (len(self.chunks), self.endpoint)
0.17.12 by Robert Collins
Encode copy ranges as bytes not lines, halves decode overhead.
825
        endpoint = self.endpoint
3735.40.17 by John Arbash Meinel
Change the attribute from 'lines' to 'chunks' to make it more
826
        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.
827
        endpoint += sum(map(len, new_chunks))
0.17.12 by Robert Collins
Encode copy ranges as bytes not lines, halves decode overhead.
828
        self.endpoint = endpoint
0.17.3 by Robert Collins
new encoder, allows non monotonically increasing sequence matches for moar compression.
829
0.17.11 by Robert Collins
Add extraction of just-compressed texts to support converting from knits.
830
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
831
def make_pack_factory(graph, delta, keylength):
832
    """Create a factory for creating a pack based groupcompress.
833
834
    This is only functional enough to run interface tests, it doesn't try to
835
    provide a full pack environment.
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
836
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
837
    :param graph: Store a graph.
838
    :param delta: Delta compress contents.
839
    :param keylength: How long should keys be.
840
    """
841
    def factory(transport):
3735.32.2 by John Arbash Meinel
The 'delta' flag has no effect on the content (all GC is delta'd),
842
        parents = graph
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
843
        ref_length = 0
844
        if graph:
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
845
            ref_length = 1
0.17.7 by Robert Collins
Update for current index2 changes.
846
        graph_index = BTreeBuilder(reference_lists=ref_length,
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
847
            key_elements=keylength)
848
        stream = transport.open_write_stream('newpack')
849
        writer = pack.ContainerWriter(stream.write)
850
        writer.begin()
851
        index = _GCGraphIndex(graph_index, lambda:True, parents=parents,
0.17.9 by Robert Collins
Initial stab at repository format support.
852
            add_callback=graph_index.add_nodes)
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
853
        access = _DirectPackAccess({})
854
        access.set_writer(writer, graph_index, (transport, 'newpack'))
0.17.2 by Robert Collins
Core proof of concept working.
855
        result = GroupCompressVersionedFiles(index, access, delta)
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
856
        result.stream = stream
857
        result.writer = writer
858
        return result
859
    return factory
860
861
862
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.
863
    versioned_files.writer.end()
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
864
    versioned_files.stream.close()
865
866
867
class GroupCompressVersionedFiles(VersionedFiles):
868
    """A group-compress based VersionedFiles implementation."""
869
0.17.2 by Robert Collins
Core proof of concept working.
870
    def __init__(self, index, access, delta=True):
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
871
        """Create a GroupCompressVersionedFiles object.
872
873
        :param index: The index object storing access and graph data.
874
        :param access: The access object storing raw data.
0.17.2 by Robert Collins
Core proof of concept working.
875
        :param delta: Whether to delta compress or just entropy compress.
876
        """
877
        self._index = index
878
        self._access = access
879
        self._delta = delta
0.17.11 by Robert Collins
Add extraction of just-compressed texts to support converting from knits.
880
        self._unadded_refs = {}
0.17.24 by Robert Collins
Add a group cache to decompression, 5 times faster than knit at decompression when accessing everything in a group.
881
        self._group_cache = LRUSizeCache(max_size=50*1024*1024)
3735.31.7 by John Arbash Meinel
Start bringing in stacking support for Groupcompress repos.
882
        self._fallback_vfs = []
0.17.2 by Robert Collins
Core proof of concept working.
883
884
    def add_lines(self, key, parents, lines, parent_texts=None,
885
        left_matching_blocks=None, nostore_sha=None, random_id=False,
886
        check_content=True):
887
        """Add a text to the store.
888
889
        :param key: The key tuple of the text to add.
890
        :param parents: The parents key tuples of the text to add.
891
        :param lines: A list of lines. Each line must be a bytestring. And all
892
            of them except the last must be terminated with \n and contain no
893
            other \n's. The last line may either contain no \n's or a single
894
            terminating \n. If the lines list does meet this constraint the add
895
            routine may error or may succeed - but you will be unable to read
896
            the data back accurately. (Checking the lines have been split
897
            correctly is expensive and extremely unlikely to catch bugs so it
898
            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.
899
        :param parent_texts: An optional dictionary containing the opaque
0.17.2 by Robert Collins
Core proof of concept working.
900
            representations of some or all of the parents of version_id to
901
            allow delta optimisations.  VERY IMPORTANT: the texts must be those
902
            returned by add_lines or data corruption can be caused.
903
        :param left_matching_blocks: a hint about which areas are common
904
            between the text and its left-hand-parent.  The format is
905
            the SequenceMatcher.get_matching_blocks format.
906
        :param nostore_sha: Raise ExistingContent and do not add the lines to
907
            the versioned file if the digest of the lines matches this.
908
        :param random_id: If True a random id has been selected rather than
909
            an id determined by some deterministic process such as a converter
910
            from a foreign VCS. When True the backend may choose not to check
911
            for uniqueness of the resulting key within the versioned file, so
912
            this should only be done when the result is expected to be unique
913
            anyway.
914
        :param check_content: If True, the lines supplied are verified to be
915
            bytestrings that are correctly formed lines.
916
        :return: The text sha1, the number of bytes in the text, and an opaque
917
                 representation of the inserted version which can be provided
918
                 back to future add_lines calls in the parent_texts dictionary.
919
        """
920
        self._index._check_write_ok()
921
        self._check_add(key, lines, random_id, check_content)
922
        if parents is None:
923
            # The caller might pass None if there is no graph data, but kndx
924
            # indexes can't directly store that, so we give them
925
            # an empty tuple instead.
926
            parents = ()
927
        # 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.
928
        length = sum(map(len, lines))
929
        record = ChunkedContentFactory(key, parents, None, lines)
3735.31.12 by John Arbash Meinel
Push nostore_sha down through the stack.
930
        sha1 = list(self._insert_record_stream([record], random_id=random_id,
931
                                               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.
932
        return sha1, length, None
0.17.2 by Robert Collins
Core proof of concept working.
933
3735.31.7 by John Arbash Meinel
Start bringing in stacking support for Groupcompress repos.
934
    def add_fallback_versioned_files(self, a_versioned_files):
935
        """Add a source of texts for texts not present in this knit.
936
937
        :param a_versioned_files: A VersionedFiles object.
938
        """
939
        self._fallback_vfs.append(a_versioned_files)
940
0.17.4 by Robert Collins
Annotate.
941
    def annotate(self, key):
942
        """See VersionedFiles.annotate."""
943
        graph = Graph(self)
0.17.5 by Robert Collins
nograph tests completely passing.
944
        parent_map = self.get_parent_map([key])
945
        if not parent_map:
946
            raise errors.RevisionNotPresent(key, self)
947
        if parent_map[key] is not None:
948
            search = graph._make_breadth_first_searcher([key])
949
            keys = set()
950
            while True:
951
                try:
952
                    present, ghosts = search.next_with_ghosts()
953
                except StopIteration:
954
                    break
955
                keys.update(present)
956
            parent_map = self.get_parent_map(keys)
957
        else:
958
            keys = [key]
959
            parent_map = {key:()}
0.17.4 by Robert Collins
Annotate.
960
        head_cache = _mod_graph.FrozenHeadsCache(graph)
961
        parent_cache = {}
962
        reannotate = annotate.reannotate
963
        for record in self.get_record_stream(keys, 'topological', True):
964
            key = record.key
0.20.2 by John Arbash Meinel
Teach groupcompress about 'chunked' encoding
965
            chunks = osutils.chunks_to_lines(record.get_bytes_as('chunked'))
0.17.4 by Robert Collins
Annotate.
966
            parent_lines = [parent_cache[parent] for parent in parent_map[key]]
967
            parent_cache[key] = list(
0.20.21 by John Arbash Meinel
Merge the chk sorting code.
968
                reannotate(parent_lines, chunks, key, None, head_cache))
0.17.4 by Robert Collins
Annotate.
969
        return parent_cache[key]
970
0.17.5 by Robert Collins
nograph tests completely passing.
971
    def check(self, progress_bar=None):
972
        """See VersionedFiles.check()."""
973
        keys = self.keys()
974
        for record in self.get_record_stream(keys, 'unordered', True):
975
            record.get_bytes_as('fulltext')
976
0.17.2 by Robert Collins
Core proof of concept working.
977
    def _check_add(self, key, lines, random_id, check_content):
978
        """check that version_id and lines are safe to add."""
979
        version_id = key[-1]
0.17.26 by Robert Collins
Working better --gc-plain-chk.
980
        if version_id is not None:
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
981
            if osutils.contains_whitespace(version_id):
3735.31.1 by John Arbash Meinel
Bring the groupcompress plugin into the brisbane-core branch.
982
                raise errors.InvalidRevisionId(version_id, self)
0.17.2 by Robert Collins
Core proof of concept working.
983
        self.check_not_reserved_id(version_id)
984
        # TODO: If random_id==False and the key is already present, we should
985
        # probably check that the existing content is identical to what is
986
        # being inserted, and otherwise raise an exception.  This would make
987
        # the bundle code simpler.
988
        if check_content:
989
            self._check_lines_not_unicode(lines)
990
            self._check_lines_are_lines(lines)
991
0.17.5 by Robert Collins
nograph tests completely passing.
992
    def get_parent_map(self, keys):
3735.31.7 by John Arbash Meinel
Start bringing in stacking support for Groupcompress repos.
993
        """Get a map of the graph parents of keys.
0.17.5 by Robert Collins
nograph tests completely passing.
994
995
        :param keys: The keys to look up parents for.
996
        :return: A mapping from keys to parents. Absent keys are absent from
997
            the mapping.
998
        """
3735.31.7 by John Arbash Meinel
Start bringing in stacking support for Groupcompress repos.
999
        return self._get_parent_map_with_sources(keys)[0]
1000
1001
    def _get_parent_map_with_sources(self, keys):
1002
        """Get a map of the parents of keys.
1003
1004
        :param keys: The keys to look up parents for.
1005
        :return: A tuple. The first element is a mapping from keys to parents.
1006
            Absent keys are absent from the mapping. The second element is a
1007
            list with the locations each key was found in. The first element
1008
            is the in-this-knit parents, the second the first fallback source,
1009
            and so on.
1010
        """
0.17.5 by Robert Collins
nograph tests completely passing.
1011
        result = {}
3735.31.7 by John Arbash Meinel
Start bringing in stacking support for Groupcompress repos.
1012
        sources = [self._index] + self._fallback_vfs
0.17.5 by Robert Collins
nograph tests completely passing.
1013
        source_results = []
1014
        missing = set(keys)
1015
        for source in sources:
1016
            if not missing:
1017
                break
1018
            new_result = source.get_parent_map(missing)
1019
            source_results.append(new_result)
1020
            result.update(new_result)
1021
            missing.difference_update(set(new_result))
3735.31.7 by John Arbash Meinel
Start bringing in stacking support for Groupcompress repos.
1022
        return result, source_results
0.17.5 by Robert Collins
nograph tests completely passing.
1023
0.25.6 by John Arbash Meinel
(tests broken) implement the basic ability to have a separate header
1024
    def _get_block(self, index_memo):
0.20.14 by John Arbash Meinel
Factor out _get_group_and_delta_lines.
1025
        read_memo = index_memo[0:3]
1026
        # get the group:
1027
        try:
0.25.6 by John Arbash Meinel
(tests broken) implement the basic ability to have a separate header
1028
            block = self._group_cache[read_memo]
0.20.14 by John Arbash Meinel
Factor out _get_group_and_delta_lines.
1029
        except KeyError:
1030
            # read the group
1031
            zdata = self._access.get_raw_records([read_memo]).next()
1032
            # decompress - whole thing - this is not a bug, as it
1033
            # permits caching. We might want to store the partially
1034
            # decompresed group and decompress object, so that recent
1035
            # texts are not penalised by big groups.
0.25.6 by John Arbash Meinel
(tests broken) implement the basic ability to have a separate header
1036
            block = GroupCompressBlock.from_bytes(zdata)
1037
            self._group_cache[read_memo] = block
0.20.14 by John Arbash Meinel
Factor out _get_group_and_delta_lines.
1038
        # cheapo debugging:
1039
        # print len(zdata), len(plain)
1040
        # parse - requires split_lines, better to have byte offsets
1041
        # here (but not by much - we only split the region for the
1042
        # recipe, and we often want to end up with lines anyway.
0.25.6 by John Arbash Meinel
(tests broken) implement the basic ability to have a separate header
1043
        return block
0.20.14 by John Arbash Meinel
Factor out _get_group_and_delta_lines.
1044
0.20.18 by John Arbash Meinel
Implement new handling of get_bytes_as(), and get_missing_compression_parent_keys()
1045
    def get_missing_compression_parent_keys(self):
1046
        """Return the keys of missing compression parents.
1047
1048
        Missing compression parents occur when a record stream was missing
1049
        basis texts, or a index was scanned that had missing basis texts.
1050
        """
1051
        # GroupCompress cannot currently reference texts that are not in the
1052
        # group, so this is valid for now
1053
        return frozenset()
1054
0.17.5 by Robert Collins
nograph tests completely passing.
1055
    def get_record_stream(self, keys, ordering, include_delta_closure):
1056
        """Get a stream of records for keys.
1057
1058
        :param keys: The keys to include.
1059
        :param ordering: Either 'unordered' or 'topological'. A topologically
1060
            sorted stream has compression parents strictly before their
1061
            children.
1062
        :param include_delta_closure: If True then the closure across any
1063
            compression parents will be included (in the opaque data).
1064
        :return: An iterator of ContentFactory objects, each of which is only
1065
            valid until the iterator is advanced.
1066
        """
1067
        # keys might be a generator
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
1068
        orig_keys = list(keys)
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1069
        keys = set(keys)
0.17.5 by Robert Collins
nograph tests completely passing.
1070
        if not keys:
1071
            return
0.20.23 by John Arbash Meinel
Add a progress indicator for chk pages.
1072
        if (not self._index.has_graph
3735.31.14 by John Arbash Meinel
Change the gc-optimal to 'groupcompress'
1073
            and ordering in ('topological', 'groupcompress')):
0.17.5 by Robert Collins
nograph tests completely passing.
1074
            # Cannot topological order when no graph has been stored.
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1075
            # but we allow 'as-requested' or 'unordered'
0.17.5 by Robert Collins
nograph tests completely passing.
1076
            ordering = 'unordered'
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1077
1078
        remaining_keys = keys
1079
        while True:
1080
            try:
1081
                keys = set(remaining_keys)
1082
                for content_factory in self._get_remaining_record_stream(keys,
1083
                        orig_keys, ordering, include_delta_closure):
1084
                    remaining_keys.discard(content_factory.key)
1085
                    yield content_factory
1086
                return
1087
            except errors.RetryWithNewPacks, e:
1088
                self._access.reload_or_raise(e)
1089
1090
    def _find_from_fallback(self, missing):
1091
        """Find whatever keys you can from the fallbacks.
1092
1093
        :param missing: A set of missing keys. This set will be mutated as keys
1094
            are found from a fallback_vfs
1095
        :return: (parent_map, key_to_source_map, source_results)
1096
            parent_map  the overall key => parent_keys
1097
            key_to_source_map   a dict from {key: source}
1098
            source_results      a list of (source: keys)
1099
        """
1100
        parent_map = {}
1101
        key_to_source_map = {}
1102
        source_results = []
1103
        for source in self._fallback_vfs:
1104
            if not missing:
1105
                break
1106
            source_parents = source.get_parent_map(missing)
1107
            parent_map.update(source_parents)
1108
            source_parents = list(source_parents)
1109
            source_results.append((source, source_parents))
1110
            key_to_source_map.update((key, source) for key in source_parents)
1111
            missing.difference_update(source_parents)
1112
        return parent_map, key_to_source_map, source_results
1113
1114
    def _get_ordered_source_keys(self, ordering, parent_map, key_to_source_map):
1115
        """Get the (source, [keys]) list.
1116
1117
        The returned objects should be in the order defined by 'ordering',
1118
        which can weave between different sources.
1119
        :param ordering: Must be one of 'topological' or 'groupcompress'
1120
        :return: List of [(source, [keys])] tuples, such that all keys are in
1121
            the defined order, regardless of source.
1122
        """
1123
        if ordering == 'topological':
1124
            present_keys = topo_sort(parent_map)
1125
        else:
1126
            # ordering == 'groupcompress'
1127
            # XXX: This only optimizes for the target ordering. We may need
1128
            #      to balance that with the time it takes to extract
1129
            #      ordering, by somehow grouping based on
1130
            #      locations[key][0:3]
1131
            present_keys = sort_gc_optimal(parent_map)
1132
        # Now group by source:
1133
        source_keys = []
1134
        current_source = None
1135
        for key in present_keys:
1136
            source = key_to_source_map.get(key, self)
1137
            if source is not current_source:
1138
                source_keys.append((source, []))
3735.32.12 by John Arbash Meinel
Add groupcompress-block[-ref] as valid stream types.
1139
                current_source = source
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1140
            source_keys[-1][1].append(key)
1141
        return source_keys
1142
1143
    def _get_as_requested_source_keys(self, orig_keys, locations, unadded_keys,
1144
                                      key_to_source_map):
1145
        source_keys = []
1146
        current_source = None
1147
        for key in orig_keys:
1148
            if key in locations or key in unadded_keys:
1149
                source = self
1150
            elif key in key_to_source_map:
1151
                source = key_to_source_map[key]
1152
            else: # absent
1153
                continue
1154
            if source is not current_source:
1155
                source_keys.append((source, []))
3735.32.12 by John Arbash Meinel
Add groupcompress-block[-ref] as valid stream types.
1156
                current_source = source
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1157
            source_keys[-1][1].append(key)
1158
        return source_keys
1159
1160
    def _get_io_ordered_source_keys(self, locations, unadded_keys,
1161
                                    source_result):
1162
        def get_group(key):
1163
            # This is the group the bytes are stored in, followed by the
1164
            # location in the group
1165
            return locations[key][0]
1166
        present_keys = sorted(locations.iterkeys(), key=get_group)
1167
        # We don't have an ordering for keys in the in-memory object, but
1168
        # lets process the in-memory ones first.
1169
        present_keys = list(unadded_keys) + present_keys
1170
        # Now grab all of the ones from other sources
1171
        source_keys = [(self, present_keys)]
1172
        source_keys.extend(source_result)
1173
        return source_keys
1174
1175
    def _get_remaining_record_stream(self, keys, orig_keys, ordering,
1176
                                     include_delta_closure):
1177
        """Get a stream of records for keys.
1178
1179
        :param keys: The keys to include.
1180
        :param ordering: one of 'unordered', 'topological', 'groupcompress' or
1181
            'as-requested'
1182
        :param include_delta_closure: If True then the closure across any
1183
            compression parents will be included (in the opaque data).
1184
        :return: An iterator of ContentFactory objects, each of which is only
1185
            valid until the iterator is advanced.
1186
        """
0.17.5 by Robert Collins
nograph tests completely passing.
1187
        # Cheap: iterate
1188
        locations = self._index.get_build_details(keys)
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1189
        unadded_keys = set(self._unadded_refs).intersection(keys)
1190
        missing = keys.difference(locations)
1191
        missing.difference_update(unadded_keys)
1192
        (fallback_parent_map, key_to_source_map,
1193
         source_result) = self._find_from_fallback(missing)
1194
        if ordering in ('topological', 'groupcompress'):
0.17.5 by Robert Collins
nograph tests completely passing.
1195
            # would be better to not globally sort initially but instead
1196
            # start with one key, recurse to its oldest parent, then grab
1197
            # everything in the same group, etc.
1198
            parent_map = dict((key, details[2]) for key, details in
1199
                locations.iteritems())
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1200
            for key in unadded_keys:
1201
                parent_map[key] = self._unadded_refs[key]
1202
            parent_map.update(fallback_parent_map)
1203
            source_keys = self._get_ordered_source_keys(ordering, parent_map,
1204
                                                        key_to_source_map)
0.22.6 by John Arbash Meinel
Clustering chk pages properly makes a big difference.
1205
        elif ordering == 'as-requested':
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1206
            source_keys = self._get_as_requested_source_keys(orig_keys,
1207
                locations, unadded_keys, key_to_source_map)
0.17.5 by Robert Collins
nograph tests completely passing.
1208
        else:
0.20.10 by John Arbash Meinel
Change the extraction ordering for 'unordered'.
1209
            # We want to yield the keys in a semi-optimal (read-wise) ordering.
1210
            # Otherwise we thrash the _group_cache and destroy performance
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1211
            source_keys = self._get_io_ordered_source_keys(locations,
1212
                unadded_keys, source_result)
1213
        for key in missing:
0.17.5 by Robert Collins
nograph tests completely passing.
1214
            yield AbsentContentFactory(key)
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
1215
        manager = None
3735.34.3 by John Arbash Meinel
Cleanup, in preparation for merging to brisbane-core.
1216
        last_read_memo = None
3735.32.15 by John Arbash Meinel
Change the GroupCompressBlock code to allow not recording 'end'.
1217
        # TODO: This works fairly well at batching up existing groups into a
1218
        #       streamable format, and possibly allowing for taking one big
1219
        #       group and splitting it when it isn't fully utilized.
1220
        #       However, it doesn't allow us to find under-utilized groups and
1221
        #       combine them into a bigger group on the fly.
1222
        #       (Consider the issue with how chk_map inserts texts
1223
        #       one-at-a-time.) This could be done at insert_record_stream()
1224
        #       time, but it probably would decrease the number of
1225
        #       bytes-on-the-wire for fetch.
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1226
        for source, keys in source_keys:
1227
            if source is self:
1228
                for key in keys:
1229
                    if key in self._unadded_refs:
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
1230
                        if manager is not None:
1231
                            for factory in manager.get_record_stream():
3735.32.12 by John Arbash Meinel
Add groupcompress-block[-ref] as valid stream types.
1232
                                yield factory
3735.34.3 by John Arbash Meinel
Cleanup, in preparation for merging to brisbane-core.
1233
                            last_read_memo = manager = None
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1234
                        bytes, sha1 = self._compressor.extract(key)
1235
                        parents = self._unadded_refs[key]
3735.32.12 by John Arbash Meinel
Add groupcompress-block[-ref] as valid stream types.
1236
                        yield FulltextContentFactory(key, parents, sha1, bytes)
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1237
                    else:
1238
                        index_memo, _, parents, (method, _) = locations[key]
3735.34.1 by John Arbash Meinel
Some testing to see if we can decrease the peak memory consumption a bit.
1239
                        read_memo = index_memo[0:3]
3735.34.3 by John Arbash Meinel
Cleanup, in preparation for merging to brisbane-core.
1240
                        if last_read_memo != read_memo:
1241
                            # We are starting a new block. If we have a
1242
                            # manager, we have found everything that fits for
1243
                            # now, so yield records
1244
                            if manager is not None:
1245
                                for factory in manager.get_record_stream():
1246
                                    yield factory
1247
                            # Now start a new manager
3735.34.1 by John Arbash Meinel
Some testing to see if we can decrease the peak memory consumption a bit.
1248
                            block = self._get_block(index_memo)
3735.34.3 by John Arbash Meinel
Cleanup, in preparation for merging to brisbane-core.
1249
                            manager = _LazyGroupContentManager(block)
1250
                            last_read_memo = read_memo
3735.32.8 by John Arbash Meinel
Some tests for the LazyGroupCompressFactory
1251
                        start, end = index_memo[3:5]
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
1252
                        manager.add_factory(key, parents, start, end)
0.17.11 by Robert Collins
Add extraction of just-compressed texts to support converting from knits.
1253
            else:
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
1254
                if manager is not None:
1255
                    for factory in manager.get_record_stream():
3735.32.12 by John Arbash Meinel
Add groupcompress-block[-ref] as valid stream types.
1256
                        yield factory
3735.34.3 by John Arbash Meinel
Cleanup, in preparation for merging to brisbane-core.
1257
                    last_read_memo = manager = None
3735.31.18 by John Arbash Meinel
Implement stacking support across all ordering implementations.
1258
                for record in source.get_record_stream(keys, ordering,
1259
                                                       include_delta_closure):
1260
                    yield record
3735.32.14 by John Arbash Meinel
Move the tests over to testing the LazyGroupContentManager object.
1261
        if manager is not None:
1262
            for factory in manager.get_record_stream():
3735.32.12 by John Arbash Meinel
Add groupcompress-block[-ref] as valid stream types.
1263
                yield factory
0.20.5 by John Arbash Meinel
Finish the Fulltext => Chunked conversions so that we work in the more-efficient Chunks.
1264
0.17.5 by Robert Collins
nograph tests completely passing.
1265
    def get_sha1s(self, keys):
1266
        """See VersionedFiles.get_sha1s()."""
1267
        result = {}
1268
        for record in self.get_record_stream(keys, 'unordered', True):
1269
            if record.sha1 != None:
1270
                result[record.key] = record.sha1
1271
            else:
1272
                if record.storage_kind != 'absent':
3735.40.2 by John Arbash Meinel
Add a groupcompress.encode_copy_instruction function.
1273
                    result[record.key] = osutils.sha_string(
1274
                        record.get_bytes_as('fulltext'))
0.17.5 by Robert Collins
nograph tests completely passing.
1275
        return result
1276
0.17.2 by Robert Collins
Core proof of concept working.
1277
    def insert_record_stream(self, stream):
1278
        """Insert a record stream into this container.
1279
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
1280
        :param stream: A stream of records to insert.
0.17.2 by Robert Collins
Core proof of concept working.
1281
        :return: None
1282
        :seealso VersionedFiles.get_record_stream:
1283
        """
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1284
        # XXX: Setting random_id=True makes
1285
        # test_insert_record_stream_existing_keys fail for groupcompress and
1286
        # groupcompress-nograph, this needs to be revisited while addressing
1287
        # 'bzr branch' performance issues.
1288
        for _ in self._insert_record_stream(stream, random_id=False):
0.17.5 by Robert Collins
nograph tests completely passing.
1289
            pass
0.17.2 by Robert Collins
Core proof of concept working.
1290
3735.32.21 by John Arbash Meinel
We now have a 'reuse_blocks=False' flag for autopack et al.
1291
    def _insert_record_stream(self, stream, random_id=False, nostore_sha=None,
1292
                              reuse_blocks=True):
0.17.2 by Robert Collins
Core proof of concept working.
1293
        """Internal core to insert a record stream into this container.
1294
1295
        This helper function has a different interface than insert_record_stream
1296
        to allow add_lines to be minimal, but still return the needed data.
1297
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
1298
        :param stream: A stream of records to insert.
3735.31.12 by John Arbash Meinel
Push nostore_sha down through the stack.
1299
        :param nostore_sha: If the sha1 of a given text matches nostore_sha,
1300
            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.
1301
        :param reuse_blocks: If the source is streaming from
1302
            groupcompress-blocks, just insert the blocks as-is, rather than
1303
            expanding the texts and inserting again.
0.17.2 by Robert Collins
Core proof of concept working.
1304
        :return: An iterator over the sha1 of the inserted records.
1305
        :seealso insert_record_stream:
1306
        :seealso add_lines:
1307
        """
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
1308
        adapters = {}
0.17.5 by Robert Collins
nograph tests completely passing.
1309
        def get_adapter(adapter_key):
1310
            try:
1311
                return adapters[adapter_key]
1312
            except KeyError:
1313
                adapter_factory = adapter_registry.get(adapter_key)
1314
                adapter = adapter_factory(self)
1315
                adapters[adapter_key] = adapter
1316
                return adapter
0.17.2 by Robert Collins
Core proof of concept working.
1317
        # This will go up to fulltexts for gc to gc fetching, which isn't
1318
        # ideal.
3735.32.19 by John Arbash Meinel
Get rid of the 'delta' flag to GroupCompressor. It didn't do anything anyway.
1319
        self._compressor = GroupCompressor()
0.17.11 by Robert Collins
Add extraction of just-compressed texts to support converting from knits.
1320
        self._unadded_refs = {}
0.17.5 by Robert Collins
nograph tests completely passing.
1321
        keys_to_add = []
0.17.6 by Robert Collins
Cap group size at 20MB internal buffer. (Probably way too big).
1322
        def flush():
3735.32.23 by John Arbash Meinel
Add a _LazyGroupContentManager._check_rebuild_block
1323
            bytes = self._compressor.flush().to_bytes()
0.17.6 by Robert Collins
Cap group size at 20MB internal buffer. (Probably way too big).
1324
            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.
1325
                [(None, len(bytes))], bytes)[0]
0.17.6 by Robert Collins
Cap group size at 20MB internal buffer. (Probably way too big).
1326
            nodes = []
1327
            for key, reads, refs in keys_to_add:
1328
                nodes.append((key, "%d %d %s" % (start, length, reads), refs))
1329
            self._index.add_records(nodes, random_id=random_id)
0.25.10 by John Arbash Meinel
Play around with detecting compression breaks.
1330
            self._unadded_refs = {}
1331
            del keys_to_add[:]
3735.32.19 by John Arbash Meinel
Get rid of the 'delta' flag to GroupCompressor. It didn't do anything anyway.
1332
            self._compressor = GroupCompressor()
0.25.10 by John Arbash Meinel
Play around with detecting compression breaks.
1333
0.20.15 by John Arbash Meinel
Change so that regions that have lots of copies get converted back
1334
        last_prefix = None
0.25.10 by John Arbash Meinel
Play around with detecting compression breaks.
1335
        max_fulltext_len = 0
0.25.11 by John Arbash Meinel
Slightly different handling of large texts.
1336
        max_fulltext_prefix = None
3735.32.20 by John Arbash Meinel
groupcompress now copies the blocks exactly as they were given.
1337
        insert_manager = None
1338
        block_start = None
1339
        block_length = None
3735.36.15 by John Arbash Meinel
Set 'combine_backing_indices=False' as the default for text and chk indices.
1340
        # XXX: TODO: remove this, it is just for safety checking for now
1341
        inserted_keys = set()
0.17.2 by Robert Collins
Core proof of concept working.
1342
        for record in stream:
0.17.5 by Robert Collins
nograph tests completely passing.
1343
            # Raise an error when a record is missing.
1344
            if record.storage_kind == 'absent':
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
1345
                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.
1346
            if random_id:
1347
                if record.key in inserted_keys:
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1348
                    trace.note('Insert claimed random_id=True,'
1349
                               ' 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.
1350
                    continue
1351
                inserted_keys.add(record.key)
3735.32.21 by John Arbash Meinel
We now have a 'reuse_blocks=False' flag for autopack et al.
1352
            if reuse_blocks:
1353
                # If the reuse_blocks flag is set, check to see if we can just
1354
                # copy a groupcompress block as-is.
1355
                if record.storage_kind == 'groupcompress-block':
1356
                    # Insert the raw block into the target repo
1357
                    insert_manager = record._manager
3735.2.163 by John Arbash Meinel
Merge bzr.dev 4187, and revert the change to fix refcycle issues.
1358
                    insert_manager._check_rebuild_block()
3735.32.21 by John Arbash Meinel
We now have a 'reuse_blocks=False' flag for autopack et al.
1359
                    bytes = record._manager._block.to_bytes()
1360
                    _, start, length = self._access.add_raw_records(
1361
                        [(None, len(bytes))], bytes)[0]
1362
                    del bytes
1363
                    block_start = start
1364
                    block_length = length
1365
                if record.storage_kind in ('groupcompress-block',
1366
                                           'groupcompress-block-ref'):
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1367
                    if insert_manager is None:
1368
                        raise AssertionError('No insert_manager set')
3735.32.21 by John Arbash Meinel
We now have a 'reuse_blocks=False' flag for autopack et al.
1369
                    value = "%d %d %d %d" % (block_start, block_length,
1370
                                             record._start, record._end)
1371
                    nodes = [(record.key, value, (record.parents,))]
3735.38.1 by John Arbash Meinel
Change the delta byte stream to remove the 'source length' entry.
1372
                    # TODO: Consider buffering up many nodes to be added, not
1373
                    #       sure how much overhead this has, but we're seeing
1374
                    #       ~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.
1375
                    self._index.add_records(nodes, random_id=random_id)
1376
                    continue
0.20.18 by John Arbash Meinel
Implement new handling of get_bytes_as(), and get_missing_compression_parent_keys()
1377
            try:
0.23.52 by John Arbash Meinel
Use the max_delta flag.
1378
                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()
1379
            except errors.UnavailableRepresentation:
0.17.5 by Robert Collins
nograph tests completely passing.
1380
                adapter_key = record.storage_kind, 'fulltext'
1381
                adapter = get_adapter(adapter_key)
0.20.21 by John Arbash Meinel
Merge the chk sorting code.
1382
                bytes = adapter.get_bytes(record)
0.20.13 by John Arbash Meinel
Play around a bit.
1383
            if len(record.key) > 1:
1384
                prefix = record.key[0]
0.25.11 by John Arbash Meinel
Slightly different handling of large texts.
1385
                soft = (prefix == last_prefix)
0.25.10 by John Arbash Meinel
Play around with detecting compression breaks.
1386
            else:
1387
                prefix = None
0.25.11 by John Arbash Meinel
Slightly different handling of large texts.
1388
                soft = False
1389
            if max_fulltext_len < len(bytes):
1390
                max_fulltext_len = len(bytes)
1391
                max_fulltext_prefix = prefix
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1392
            (found_sha1, start_point, end_point,
1393
             type) = self._compressor.compress(record.key,
1394
                                               bytes, record.sha1, soft=soft,
1395
                                               nostore_sha=nostore_sha)
1396
            # delta_ratio = float(len(bytes)) / (end_point - start_point)
0.25.10 by John Arbash Meinel
Play around with detecting compression breaks.
1397
            # Check if we want to continue to include that text
0.25.11 by John Arbash Meinel
Slightly different handling of large texts.
1398
            if (prefix == max_fulltext_prefix
1399
                and end_point < 2 * max_fulltext_len):
1400
                # As long as we are on the same file_id, we will fill at least
1401
                # 2 * max_fulltext_len
1402
                start_new_block = False
1403
            elif end_point > 4*1024*1024:
1404
                start_new_block = True
1405
            elif (prefix is not None and prefix != last_prefix
1406
                  and end_point > 2*1024*1024):
1407
                start_new_block = True
1408
            else:
1409
                start_new_block = False
0.25.10 by John Arbash Meinel
Play around with detecting compression breaks.
1410
            last_prefix = prefix
1411
            if start_new_block:
1412
                self._compressor.pop_last()
1413
                flush()
1414
                max_fulltext_len = len(bytes)
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1415
                (found_sha1, start_point, end_point,
1416
                 type) = self._compressor.compress(record.key, bytes,
1417
                                                   record.sha1)
0.17.26 by Robert Collins
Working better --gc-plain-chk.
1418
            if record.key[-1] is None:
1419
                key = record.key[:-1] + ('sha1:' + found_sha1,)
1420
            else:
1421
                key = record.key
1422
            self._unadded_refs[key] = record.parents
0.17.3 by Robert Collins
new encoder, allows non monotonically increasing sequence matches for moar compression.
1423
            yield found_sha1
3735.2.164 by John Arbash Meinel
Fix a critical bug that caused problems with the index entries.
1424
            keys_to_add.append((key, '%d %d' % (start_point, end_point),
0.17.5 by Robert Collins
nograph tests completely passing.
1425
                (record.parents,)))
0.17.8 by Robert Collins
Flush pending updates at the end of _insert_record_stream
1426
        if len(keys_to_add):
1427
            flush()
0.17.11 by Robert Collins
Add extraction of just-compressed texts to support converting from knits.
1428
        self._compressor = None
0.17.5 by Robert Collins
nograph tests completely passing.
1429
1430
    def iter_lines_added_or_present_in_keys(self, keys, pb=None):
1431
        """Iterate over the lines in the versioned files from keys.
1432
1433
        This may return lines from other keys. Each item the returned
1434
        iterator yields is a tuple of a line and a text version that that line
1435
        is present in (not introduced in).
1436
1437
        Ordering of results is in whatever order is most suitable for the
1438
        underlying storage format.
1439
1440
        If a progress bar is supplied, it may be used to indicate progress.
1441
        The caller is responsible for cleaning up progress bars (because this
1442
        is an iterator).
1443
1444
        NOTES:
1445
         * Lines are normalised by the underlying store: they will all have \n
1446
           terminators.
1447
         * Lines are returned in arbitrary order.
1448
1449
        :return: An iterator over (line, key).
1450
        """
1451
        if pb is None:
1452
            pb = progress.DummyProgress()
1453
        keys = set(keys)
1454
        total = len(keys)
1455
        # we don't care about inclusions, the caller cares.
1456
        # but we need to setup a list of records to visit.
1457
        # we need key, position, length
1458
        for key_idx, record in enumerate(self.get_record_stream(keys,
1459
            'unordered', True)):
1460
            # XXX: todo - optimise to use less than full texts.
1461
            key = record.key
3735.32.1 by John Arbash Meinel
Fix the VF WalkingContent checks.
1462
            pb.update('Walking content', key_idx, total)
0.17.5 by Robert Collins
nograph tests completely passing.
1463
            if record.storage_kind == 'absent':
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
1464
                raise errors.RevisionNotPresent(key, self)
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1465
            lines = osutils.split_lines(record.get_bytes_as('fulltext'))
0.17.5 by Robert Collins
nograph tests completely passing.
1466
            for line in lines:
1467
                yield line, key
3735.32.1 by John Arbash Meinel
Fix the VF WalkingContent checks.
1468
        pb.update('Walking content', total, total)
0.17.5 by Robert Collins
nograph tests completely passing.
1469
1470
    def keys(self):
1471
        """See VersionedFiles.keys."""
1472
        if 'evil' in debug.debug_flags:
1473
            trace.mutter_callsite(2, "keys scales with size of history")
3735.31.7 by John Arbash Meinel
Start bringing in stacking support for Groupcompress repos.
1474
        sources = [self._index] + self._fallback_vfs
0.17.5 by Robert Collins
nograph tests completely passing.
1475
        result = set()
1476
        for source in sources:
1477
            result.update(source.keys())
1478
        return result
1479
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
1480
1481
class _GCGraphIndex(object):
1482
    """Mapper from GroupCompressVersionedFiles needs into GraphIndex storage."""
1483
0.17.9 by Robert Collins
Initial stab at repository format support.
1484
    def __init__(self, graph_index, is_locked, parents=True,
0.17.1 by Robert Collins
Starting point. Interface tests hooked up and failing.
1485
        add_callback=None):
1486
        """Construct a _GCGraphIndex on a graph_index.
1487
1488
        :param graph_index: An implementation of bzrlib.index.GraphIndex.
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
1489
        :param is_locked: A callback, returns True if the index is locked and
1490
            thus usable.
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
1491
        :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.
1492
            parents.
1493
        :param add_callback: If not None, allow additions to the index and call
1494
            this callback with a list of added GraphIndex nodes:
1495
            [(node, value, node_refs), ...]
1496
        """
1497
        self._add_callback = add_callback
1498
        self._graph_index = graph_index
1499
        self._parents = parents
1500
        self.has_graph = parents
1501
        self._is_locked = is_locked
1502
0.17.5 by Robert Collins
nograph tests completely passing.
1503
    def add_records(self, records, random_id=False):
1504
        """Add multiple records to the index.
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
1505
0.17.5 by Robert Collins
nograph tests completely passing.
1506
        This function does not insert data into the Immutable GraphIndex
1507
        backing the KnitGraphIndex, instead it prepares data for insertion by
1508
        the caller and checks that it is safe to insert then calls
1509
        self._add_callback with the prepared GraphIndex nodes.
1510
1511
        :param records: a list of tuples:
1512
                         (key, options, access_memo, parents).
1513
        :param random_id: If True the ids being added were randomly generated
1514
            and no check for existence will be performed.
1515
        """
1516
        if not self._add_callback:
1517
            raise errors.ReadOnlyError(self)
1518
        # we hope there are no repositories with inconsistent parentage
1519
        # anymore.
1520
1521
        changed = False
1522
        keys = {}
1523
        for (key, value, refs) in records:
1524
            if not self._parents:
1525
                if refs:
1526
                    for ref in refs:
1527
                        if ref:
1528
                            raise KnitCorrupt(self,
1529
                                "attempt to add node with parents "
1530
                                "in parentless index.")
1531
                    refs = ()
1532
                    changed = True
1533
            keys[key] = (value, refs)
1534
        # check for dups
1535
        if not random_id:
1536
            present_nodes = self._get_entries(keys)
1537
            for (index, key, value, node_refs) in present_nodes:
1538
                if node_refs != keys[key][1]:
1539
                    raise errors.KnitCorrupt(self, "inconsistent details in add_records"
1540
                        ": %s %s" % ((value, node_refs), keys[key]))
1541
                del keys[key]
1542
                changed = True
1543
        if changed:
1544
            result = []
1545
            if self._parents:
1546
                for key, (value, node_refs) in keys.iteritems():
1547
                    result.append((key, value, node_refs))
1548
            else:
1549
                for key, (value, node_refs) in keys.iteritems():
1550
                    result.append((key, value))
1551
            records = result
1552
        self._add_callback(records)
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
1553
0.17.5 by Robert Collins
nograph tests completely passing.
1554
    def _check_read(self):
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
1555
        """Raise an exception if reads are not permitted."""
0.17.5 by Robert Collins
nograph tests completely passing.
1556
        if not self._is_locked():
1557
            raise errors.ObjectNotLocked(self)
1558
0.17.2 by Robert Collins
Core proof of concept working.
1559
    def _check_write_ok(self):
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
1560
        """Raise an exception if writes are not permitted."""
0.17.2 by Robert Collins
Core proof of concept working.
1561
        if not self._is_locked():
1562
            raise errors.ObjectNotLocked(self)
1563
0.17.5 by Robert Collins
nograph tests completely passing.
1564
    def _get_entries(self, keys, check_present=False):
1565
        """Get the entries for keys.
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
1566
1567
        Note: Callers are responsible for checking that the index is locked
1568
        before calling this method.
1569
0.17.5 by Robert Collins
nograph tests completely passing.
1570
        :param keys: An iterable of index key tuples.
1571
        """
1572
        keys = set(keys)
1573
        found_keys = set()
1574
        if self._parents:
1575
            for node in self._graph_index.iter_entries(keys):
1576
                yield node
1577
                found_keys.add(node[1])
1578
        else:
1579
            # adapt parentless index to the rest of the code.
1580
            for node in self._graph_index.iter_entries(keys):
1581
                yield node[0], node[1], node[2], ()
1582
                found_keys.add(node[1])
1583
        if check_present:
1584
            missing_keys = keys.difference(found_keys)
1585
            if missing_keys:
1586
                raise RevisionNotPresent(missing_keys.pop(), self)
1587
1588
    def get_parent_map(self, keys):
1589
        """Get a map of the parents of keys.
1590
1591
        :param keys: The keys to look up parents for.
1592
        :return: A mapping from keys to parents. Absent keys are absent from
1593
            the mapping.
1594
        """
1595
        self._check_read()
1596
        nodes = self._get_entries(keys)
1597
        result = {}
1598
        if self._parents:
1599
            for node in nodes:
1600
                result[node[1]] = node[3][0]
1601
        else:
1602
            for node in nodes:
1603
                result[node[1]] = None
1604
        return result
1605
1606
    def get_build_details(self, keys):
1607
        """Get the various build details for keys.
1608
1609
        Ghosts are omitted from the result.
1610
1611
        :param keys: An iterable of keys.
1612
        :return: A dict of key:
1613
            (index_memo, compression_parent, parents, record_details).
1614
            index_memo
1615
                opaque structure to pass to read_records to extract the raw
1616
                data
1617
            compression_parent
1618
                Content that this record is built upon, may be None
1619
            parents
1620
                Logical parents of this node
1621
            record_details
1622
                extra information about the content which needs to be passed to
1623
                Factory.parse_record
1624
        """
1625
        self._check_read()
1626
        result = {}
0.20.29 by Ian Clatworthy
groupcompress.py code cleanups
1627
        entries = self._get_entries(keys)
0.17.5 by Robert Collins
nograph tests completely passing.
1628
        for entry in entries:
1629
            key = entry[1]
1630
            if not self._parents:
1631
                parents = None
1632
            else:
1633
                parents = entry[3][0]
1634
            method = 'group'
1635
            result[key] = (self._node_to_position(entry),
1636
                                  None, parents, (method, None))
1637
        return result
3735.31.2 by John Arbash Meinel
Cleanup trailing whitespace, get test_source to pass by removing asserts.
1638
0.17.5 by Robert Collins
nograph tests completely passing.
1639
    def keys(self):
1640
        """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.
1641
0.17.5 by Robert Collins
nograph tests completely passing.
1642
        The keys are not ordered.
1643
        """
1644
        self._check_read()
1645
        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.
1646
0.17.5 by Robert Collins
nograph tests completely passing.
1647
    def _node_to_position(self, node):
1648
        """Convert an index value to position details."""
1649
        bits = node[2].split(' ')
1650
        # It would be nice not to read the entire gzip.
1651
        start = int(bits[0])
1652
        stop = int(bits[1])
1653
        basis_end = int(bits[2])
1654
        delta_end = int(bits[3])
1655
        return node[0], start, stop, basis_end, delta_end
0.18.14 by John Arbash Meinel
A bit more work, not really usable yet.
1656
1657
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
1658
from bzrlib._groupcompress_py import (
1659
    apply_delta,
3735.40.19 by John Arbash Meinel
Implement apply_delta_to_source which doesn't have to malloc another string.
1660
    apply_delta_to_source,
3735.40.11 by John Arbash Meinel
Implement make_delta and apply_delta.
1661
    encode_base128_int,
1662
    decode_base128_int,
3735.40.13 by John Arbash Meinel
Rename EquivalenceTable to LinesDeltaIndex.
1663
    LinesDeltaIndex,
3735.40.4 by John Arbash Meinel
Factor out tests that rely on the exact bytecode.
1664
    )
0.18.14 by John Arbash Meinel
A bit more work, not really usable yet.
1665
try:
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1666
    from bzrlib._groupcompress_pyx import (
1667
        apply_delta,
3735.40.19 by John Arbash Meinel
Implement apply_delta_to_source which doesn't have to malloc another string.
1668
        apply_delta_to_source,
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1669
        DeltaIndex,
3735.40.16 by John Arbash Meinel
Implement (de|en)code_base128_int in pyrex.
1670
        encode_base128_int,
1671
        decode_base128_int,
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1672
        )
3735.40.2 by John Arbash Meinel
Add a groupcompress.encode_copy_instruction function.
1673
    GroupCompressor = PyrexGroupCompressor
0.18.14 by John Arbash Meinel
A bit more work, not really usable yet.
1674
except ImportError:
4241.6.6 by Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil
Groupcompress from brisbane-core.
1675
    GroupCompressor = PythonGroupCompressor
1676