zstd: vendor python-zstandard 0.7.0 Commit 3054ae3a66112970a091d3939fee32c2d0c1a23e from https://github.com/indygreg/python-zstandard is imported without modifications (other than removing unwanted files). The vendored zstd library within has been upgraded from 1.1.2 to 1.1.3. This version introduced new APIs for threads, thread pools, multi-threaded compression, and a new dictionary builder (COVER). These features are not yet used by python-zstandard (or Mercurial for that matter). However, that will likely change in the next python-zstandard release (and I think there are opportunities for Mercurial to take advantage of the multi-threaded APIs). Relevant to Mercurial, the CFFI bindings are now fully implemented. This means zstd should "just work" with PyPy (although I haven't tried). The python-zstandard test suite also runs all tests against both the C extension and CFFI bindings to ensure feature parity. There is also a "decompress_content_dict_chain()" API. This was derived from discussions with Yann Collet on list about alternate ways of encoding delta chains. The change most relevant to Mercurial is a performance enhancement in the simple decompression API to reuse a data structure across operations. This makes decompression of multiple inputs significantly faster. (This scenario occurs when reading revlog delta chains, for example.) Using python-zstandard's bench.py to measure the performance difference... On changelog chunks in the mozilla-unified repo: decompress discrete decompress() reuse zctx 1.262243 wall; 1.260000 CPU; 1.260000 user; 0.000000 sys 170.43 MB/s (best of 3) 0.949106 wall; 0.950000 CPU; 0.950000 user; 0.000000 sys 226.66 MB/s (best of 4) decompress discrete dict decompress() reuse zctx 0.692170 wall; 0.690000 CPU; 0.690000 user; 0.000000 sys 310.80 MB/s (best of 5) 0.437088 wall; 0.440000 CPU; 0.440000 user; 0.000000 sys 492.17 MB/s (best of 7) On manifest chunks in the mozilla-unified repo: decompress discrete decompress() reuse zctx 1.367284 wall; 1.370000 CPU; 1.370000 user; 0.000000 sys 274.01 MB/s (best of 3) 1.086831 wall; 1.080000 CPU; 1.080000 user; 0.000000 sys 344.72 MB/s (best of 3) decompress discrete dict decompress() reuse zctx 0.993272 wall; 0.990000 CPU; 0.990000 user; 0.000000 sys 377.19 MB/s (best of 3) 0.678651 wall; 0.680000 CPU; 0.680000 user; 0.000000 sys 552.06 MB/s (best of 5) That should make reads on zstd revlogs a bit faster ;) # no-check-commit

     1

import inspect

     2

import io

     3

import types

     4

     5

     6

def make_cffi(cls):

     7

    """Decorator to add CFFI versions of each test method."""

     8

     9

    try:

    10

        import zstd_cffi

    11

    except ImportError:

    12

        return cls

    13

    14

    # If CFFI version is available, dynamically construct test methods

    15

    # that use it.

    16

    17

    for attr in dir(cls):

    18

        fn = getattr(cls, attr)

    19

        if not inspect.ismethod(fn) and not inspect.isfunction(fn):

    20

            continue

    21

    22

        if not fn.__name__.startswith('test_'):

    23

            continue

    24

    25

        name = '%s_cffi' % fn.__name__

    26

    27

        # Replace the "zstd" symbol with the CFFI module instance. Then copy

    28

        # the function object and install it in a new attribute.

    29

        if isinstance(fn, types.FunctionType):

    30

            globs = dict(fn.__globals__)

    31

            globs['zstd'] = zstd_cffi

    32

            new_fn = types.FunctionType(fn.__code__, globs, name,

    33

                                        fn.__defaults__, fn.__closure__)

    34

            new_method = new_fn

    35

        else:

    36

            globs = dict(fn.__func__.func_globals)

    37

            globs['zstd'] = zstd_cffi

    38

            new_fn = types.FunctionType(fn.__func__.func_code, globs, name,

    39

                                        fn.__func__.func_defaults,

    40

                                        fn.__func__.func_closure)

    41

            new_method = types.UnboundMethodType(new_fn, fn.im_self,

    42

                                                 fn.im_class)

    43

    44

        setattr(cls, name, new_method)

    45

    46

    return cls

    47

    48

    49

class OpCountingBytesIO(io.BytesIO):

    50

    def __init__(self, *args, **kwargs):

    51

        self._read_count = 0

    52

        self._write_count = 0

    53

        return super(OpCountingBytesIO, self).__init__(*args, **kwargs)

    54

    55

    def read(self, *args):

    56

        self._read_count += 1

    57

        return super(OpCountingBytesIO, self).read(*args)

    58

    59

    def write(self, data):

    60

        self._write_count += 1

    61

        return super(OpCountingBytesIO, self).write(data)