/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3641.3.29 by John Arbash Meinel
Cleanup the copyright headers
1
# Copyright (C) 2008 Canonical Ltd
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
2
#
3
# This program is free software; you can redistribute it and/or modify
3641.3.29 by John Arbash Meinel
Cleanup the copyright headers
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.
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
7
#
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.
12
#
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
16
#
17
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
18
"""ChunkWriter: write compressed data out with a fixed upper bound."""
19
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
20
import zlib
21
from zlib import Z_FINISH, Z_SYNC_FLUSH
22
23
24
class ChunkWriter(object):
25
    """ChunkWriter allows writing of compressed data with a fixed size.
26
27
    If less data is supplied than fills a chunk, the chunk is padded with
28
    NULL bytes. If more data is supplied, then the writer packs as much
29
    in as it can, but never splits any item it was given.
30
31
    The algorithm for packing is open to improvement! Current it is:
32
     - write the bytes given
33
     - if the total seen bytes so far exceeds the chunk size, flush.
3641.3.4 by John Arbash Meinel
Tweak some 'sum' lines.
34
35
    :cvar _max_repack: To fit the maximum number of entries into a node, we
36
        will sometimes start over and compress the whole list to get tighter
37
        packing. We get diminishing returns after a while, so this limits the
38
        number of times we will try.
3641.5.18 by John Arbash Meinel
Clean out the global state, good for prototyping and tuning, bad for production code.
39
        The default is to try to avoid recompressing entirely, but setting this
40
        to something like 20 will give maximum compression.
41
42
    :cvar _max_zsync: Another tunable nob. If _max_repack is set to 0, then you
43
        can limit the number of times we will try to pack more data into a
44
        node. This allows us to do a single compression pass, rather than
45
        trying until we overflow, and then recompressing again.
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
46
    """
3641.5.18 by John Arbash Meinel
Clean out the global state, good for prototyping and tuning, bad for production code.
47
    #    In testing, some values for bzr.dev::
48
    #        repack  time  MB   max   full
49
    #         1       7.5  4.6  1140  0
3777.5.1 by John Arbash Meinel
Add ChunkWriter.optimize(for_size=True)
50
    #         2       8.4  4.2  1036  1
3641.5.18 by John Arbash Meinel
Clean out the global state, good for prototyping and tuning, bad for production code.
51
    #         3       9.8  4.1  1012  278
52
    #         4      10.8  4.1  728   945
53
    #        20      11.1  4.1  0     1012
54
    #        repack = 0
3777.5.1 by John Arbash Meinel
Add ChunkWriter.optimize(for_size=True)
55
    #        zsync   time  MB    repack  stop_for_z
56
    #         0       5.0  24.7  0       6270
57
    #         1       4.3  13.2  0       3342
58
    #         2       4.9   9.6  0       2414
59
    #         5       4.8   6.2  0       1549
60
    #         6       4.8   5.8  1       1435
61
    #         7       4.8   5.5  19      1337
62
    #         8       4.4   5.3  81      1220
63
    #        10       5.3   5.0  260     967
64
    #        11       5.3   4.9  366     839
65
    #        12       5.1   4.8  454     731
66
    #        15       5.8   4.7  704     450
67
    #        20       5.8   4.6  1133    7
3641.5.18 by John Arbash Meinel
Clean out the global state, good for prototyping and tuning, bad for production code.
68
69
    #    In testing, some values for mysql-unpacked::
70
    #                next_bytes estim
3777.5.1 by John Arbash Meinel
Add ChunkWriter.optimize(for_size=True)
71
    #        repack  time  MB    full    stop_for_repack
72
    #         1            15.4  0       3913
73
    #         2      35.4  13.7  0       346
74
    #        20      46.7  13.4  3380    0
3641.5.18 by John Arbash Meinel
Clean out the global state, good for prototyping and tuning, bad for production code.
75
    #        repack=0
3777.5.1 by John Arbash Meinel
Add ChunkWriter.optimize(for_size=True)
76
    #        zsync                       stop_for_z
77
    #         0      29.5 116.5  0       29782
78
    #         1      27.8  60.2  0       15356
79
    #         2      27.8  42.4  0       10822
80
    #         5      26.8  25.5  0       6491
81
    #         6      27.3  23.2  13      5896
82
    #         7      27.5  21.6  29      5451
83
    #         8      27.1  20.3  52      5108
84
    #        10      29.4  18.6  195     4526
85
    #        11      29.2  18.0  421     4143
86
    #        12      28.0  17.5  702     3738
87
    #        15      28.9  16.5  1223    2969
88
    #        20      29.6  15.7  2182    1810
89
    #        30      31.4  15.4  3891    23
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
90
3777.5.1 by John Arbash Meinel
Add ChunkWriter.optimize(for_size=True)
91
    # Tuple of (num_repack_attempts, num_zsync_attempts)
92
    # num_zsync_attempts only has meaning if num_repack_attempts is 0.
93
    _repack_opts_for_speed = (0, 8)
94
    _repack_opts_for_size = (20, 0)
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
95
3777.5.2 by John Arbash Meinel
Change the name to ChunkWriter.set_optimize()
96
    def __init__(self, chunk_size, reserved=0, optimize_for_size=False):
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
97
        """Create a ChunkWriter to write chunk_size chunks.
98
99
        :param chunk_size: The total byte count to emit at the end of the
100
            chunk.
101
        :param reserved: How many bytes to allow for reserved data. reserved
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
102
            data space can only be written to via the write(...,
103
            reserved=True).
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
104
        """
105
        self.chunk_size = chunk_size
106
        self.compressor = zlib.compressobj()
107
        self.bytes_in = []
108
        self.bytes_list = []
3641.3.16 by John Arbash Meinel
Somewhat surprisingly, tracking bytes_out_len makes a
109
        self.bytes_out_len = 0
3641.5.2 by John Arbash Meinel
(broken, but hopeful) Change the compact logic.
110
        # bytes that have been seen, but not included in a flush to out yet
111
        self.unflushed_in_bytes = 0
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
112
        self.num_repack = 0
3641.5.12 by John Arbash Meinel
Play around with max_repack=0 and limiting work done based on
113
        self.num_zsync = 0
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
114
        self.unused_bytes = None
115
        self.reserved_size = reserved
3777.5.1 by John Arbash Meinel
Add ChunkWriter.optimize(for_size=True)
116
        # Default is to make building fast rather than compact
3777.5.2 by John Arbash Meinel
Change the name to ChunkWriter.set_optimize()
117
        self.set_optimize(for_size=optimize_for_size)
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
118
119
    def finish(self):
120
        """Finish the chunk.
121
122
        This returns the final compressed chunk, and either None, or the
123
        bytes that did not fit in the chunk.
3641.5.19 by John Arbash Meinel
Documentation cleanup pass.
124
125
        :return: (compressed_bytes, unused_bytes, num_nulls_needed)
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
126
127
            * compressed_bytes: a list of bytes that were output from the
128
              compressor. If the compressed length was not exactly chunk_size,
129
              the final string will be a string of all null bytes to pad this
130
              to chunk_size
131
            * unused_bytes: None, or the last bytes that were added, which we
132
              could not fit.
133
            * num_nulls_needed: How many nulls are padded at the end
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
134
        """
7143.15.2 by Jelmer Vernooij
Run autopep8.
135
        self.bytes_in = None  # Free the data cached so far, we don't need it
3641.3.16 by John Arbash Meinel
Somewhat surprisingly, tracking bytes_out_len makes a
136
        out = self.compressor.flush(Z_FINISH)
137
        self.bytes_list.append(out)
138
        self.bytes_out_len += len(out)
3641.5.12 by John Arbash Meinel
Play around with max_repack=0 and limiting work done based on
139
3641.3.16 by John Arbash Meinel
Somewhat surprisingly, tracking bytes_out_len makes a
140
        if self.bytes_out_len > self.chunk_size:
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
141
            raise AssertionError('Somehow we ended up with too much'
142
                                 ' compressed data, %d > %d'
3641.3.16 by John Arbash Meinel
Somewhat surprisingly, tracking bytes_out_len makes a
143
                                 % (self.bytes_out_len, self.chunk_size))
3644.2.3 by John Arbash Meinel
Do a bit more work to get all the tests to pass.
144
        nulls_needed = self.chunk_size - self.bytes_out_len
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
145
        if nulls_needed:
6724.2.1 by Martin
Make chunk_writer use bytes for null padding
146
            self.bytes_list.append(b"\x00" * nulls_needed)
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
147
        return self.bytes_list, self.unused_bytes, nulls_needed
148
3777.5.2 by John Arbash Meinel
Change the name to ChunkWriter.set_optimize()
149
    def set_optimize(self, for_size=True):
150
        """Change how we optimize our writes.
151
152
        :param for_size: If True, optimize for minimum space usage, otherwise
153
            optimize for fastest writing speed.
154
        :return: None
155
        """
156
        if for_size:
157
            opts = ChunkWriter._repack_opts_for_size
158
        else:
159
            opts = ChunkWriter._repack_opts_for_speed
160
        self._max_repack, self._max_zsync = opts
161
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
162
    def _recompress_all_bytes_in(self, extra_bytes=None):
3641.3.12 by John Arbash Meinel
Collect some info on the space/time tradeoff for _max_repack.
163
        """Recompress the current bytes_in, and optionally more.
164
3641.5.19 by John Arbash Meinel
Documentation cleanup pass.
165
        :param extra_bytes: Optional, if supplied we will add it with
3641.3.12 by John Arbash Meinel
Collect some info on the space/time tradeoff for _max_repack.
166
            Z_SYNC_FLUSH
3641.5.19 by John Arbash Meinel
Documentation cleanup pass.
167
        :return: (bytes_out, bytes_out_len, alt_compressed)
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
168
169
            * bytes_out: is the compressed bytes returned from the compressor
170
            * bytes_out_len: the length of the compressed output
171
            * compressor: An object with everything packed in so far, and
172
              Z_SYNC_FLUSH called.
3641.3.12 by John Arbash Meinel
Collect some info on the space/time tradeoff for _max_repack.
173
        """
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
174
        compressor = zlib.compressobj()
175
        bytes_out = []
3641.3.5 by John Arbash Meinel
For iter_all and three_level tests adjust spill-at.
176
        append = bytes_out.append
177
        compress = compressor.compress
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
178
        for accepted_bytes in self.bytes_in:
3641.3.5 by John Arbash Meinel
For iter_all and three_level tests adjust spill-at.
179
            out = compress(accepted_bytes)
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
180
            if out:
3641.3.5 by John Arbash Meinel
For iter_all and three_level tests adjust spill-at.
181
                append(out)
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
182
        if extra_bytes:
3641.3.5 by John Arbash Meinel
For iter_all and three_level tests adjust spill-at.
183
            out = compress(extra_bytes)
3641.5.10 by John Arbash Meinel
Only Z_SYNC_FLUSH when we have extra bytes.
184
            out += compressor.flush(Z_SYNC_FLUSH)
185
            append(out)
3641.3.27 by John Arbash Meinel
Bringing reserved in as a keyword to write() also saves some time.
186
        bytes_out_len = sum(map(len, bytes_out))
187
        return bytes_out, bytes_out_len, compressor
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
188
3641.3.27 by John Arbash Meinel
Bringing reserved in as a keyword to write() also saves some time.
189
    def write(self, bytes, reserved=False):
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
190
        """Write some bytes to the chunk.
191
192
        If the bytes fit, False is returned. Otherwise True is returned
193
        and the bytes have not been added to the chunk.
3641.5.19 by John Arbash Meinel
Documentation cleanup pass.
194
195
        :param bytes: The bytes to include
196
        :param reserved: If True, we can use the space reserved in the
197
            constructor.
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
198
        """
3641.5.2 by John Arbash Meinel
(broken, but hopeful) Change the compact logic.
199
        if self.num_repack > self._max_repack and not reserved:
200
            self.unused_bytes = bytes
201
            return True
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
202
        if reserved:
203
            capacity = self.chunk_size
204
        else:
205
            capacity = self.chunk_size - self.reserved_size
3641.3.27 by John Arbash Meinel
Bringing reserved in as a keyword to write() also saves some time.
206
        comp = self.compressor
3641.5.19 by John Arbash Meinel
Documentation cleanup pass.
207
3641.5.2 by John Arbash Meinel
(broken, but hopeful) Change the compact logic.
208
        # Check to see if the currently unflushed bytes would fit with a bit of
209
        # room to spare, assuming no compression.
210
        next_unflushed = self.unflushed_in_bytes + len(bytes)
211
        remaining_capacity = capacity - self.bytes_out_len - 10
212
        if (next_unflushed < remaining_capacity):
3641.5.19 by John Arbash Meinel
Documentation cleanup pass.
213
            # looks like it will fit
3641.3.27 by John Arbash Meinel
Bringing reserved in as a keyword to write() also saves some time.
214
            out = comp.compress(bytes)
3641.3.11 by John Arbash Meinel
Start working on an alternate way to track compressed_chunk state.
215
            if out:
216
                self.bytes_list.append(out)
3641.3.16 by John Arbash Meinel
Somewhat surprisingly, tracking bytes_out_len makes a
217
                self.bytes_out_len += len(out)
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
218
            self.bytes_in.append(bytes)
3641.5.2 by John Arbash Meinel
(broken, but hopeful) Change the compact logic.
219
            self.unflushed_in_bytes += len(bytes)
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
220
        else:
221
            # This may or may not fit, try to add it with Z_SYNC_FLUSH
3641.5.5 by John Arbash Meinel
Document my attempt to use copy() as a look-ahead.
222
            # Note: It is tempting to do this as a look-ahead pass, and to
3641.5.19 by John Arbash Meinel
Documentation cleanup pass.
223
            #       'copy()' the compressor before flushing. However, it seems
224
            #       that Which means that it is the same thing as increasing
225
            #       repack, similar cost, same benefit. And this way we still
226
            #       have the 'repack' knob that can be adjusted, and not depend
227
            #       on a platform-specific 'copy()' function.
3641.5.12 by John Arbash Meinel
Play around with max_repack=0 and limiting work done based on
228
            self.num_zsync += 1
229
            if self._max_repack == 0 and self.num_zsync > self._max_zsync:
230
                self.num_repack += 1
3641.5.19 by John Arbash Meinel
Documentation cleanup pass.
231
                self.unused_bytes = bytes
3641.5.12 by John Arbash Meinel
Play around with max_repack=0 and limiting work done based on
232
                return True
3641.3.27 by John Arbash Meinel
Bringing reserved in as a keyword to write() also saves some time.
233
            out = comp.compress(bytes)
234
            out += comp.flush(Z_SYNC_FLUSH)
3641.5.2 by John Arbash Meinel
(broken, but hopeful) Change the compact logic.
235
            self.unflushed_in_bytes = 0
3641.3.15 by John Arbash Meinel
Now that we have real data, remove the copy() code.
236
            if out:
237
                self.bytes_list.append(out)
3641.3.16 by John Arbash Meinel
Somewhat surprisingly, tracking bytes_out_len makes a
238
                self.bytes_out_len += len(out)
3641.5.3 by John Arbash Meinel
If we repack earlier, it catches this case.
239
240
            # We are a bit extra conservative, because it seems that you *can*
241
            # get better compression with Z_SYNC_FLUSH than a full compress. It
242
            # is probably very rare, but we were able to trigger it.
3641.5.4 by John Arbash Meinel
Using a different safety margin for the first repack,
243
            if self.num_repack == 0:
244
                safety_margin = 100
245
            else:
246
                safety_margin = 10
247
            if self.bytes_out_len + safety_margin <= capacity:
3641.5.1 by John Arbash Meinel
Update the stats for the current code layout.
248
                # It fit, so mark it added
249
                self.bytes_in.append(bytes)
250
            else:
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
251
                # We are over budget, try to squeeze this in without any
252
                # Z_SYNC_FLUSH calls
253
                self.num_repack += 1
3641.5.1 by John Arbash Meinel
Update the stats for the current code layout.
254
                (bytes_out, this_len,
255
                 compressor) = self._recompress_all_bytes_in(bytes)
256
                if self.num_repack >= self._max_repack:
257
                    # When we get *to* _max_repack, bump over so that the
258
                    # earlier > _max_repack will be triggered.
259
                    self.num_repack += 1
3641.3.16 by John Arbash Meinel
Somewhat surprisingly, tracking bytes_out_len makes a
260
                if this_len + 10 > capacity:
3641.5.1 by John Arbash Meinel
Update the stats for the current code layout.
261
                    (bytes_out, this_len,
262
                     compressor) = self._recompress_all_bytes_in()
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
263
                    self.compressor = compressor
3641.5.2 by John Arbash Meinel
(broken, but hopeful) Change the compact logic.
264
                    # Force us to not allow more data
265
                    self.num_repack = self._max_repack + 1
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
266
                    self.bytes_list = bytes_out
3641.3.27 by John Arbash Meinel
Bringing reserved in as a keyword to write() also saves some time.
267
                    self.bytes_out_len = this_len
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
268
                    self.unused_bytes = bytes
269
                    return True
270
                else:
271
                    # This fits when we pack it tighter, so use the new packing
272
                    self.compressor = compressor
273
                    self.bytes_in.append(bytes)
274
                    self.bytes_list = bytes_out
3641.3.16 by John Arbash Meinel
Somewhat surprisingly, tracking bytes_out_len makes a
275
                    self.bytes_out_len = this_len
3641.3.1 by John Arbash Meinel
Bring in the btree_index and chunk_writer code and their tests.
276
        return False