Mercurial > hg
view tests/test-fastannotate-corrupt.t @ 44248:12491abf93bd stable
worker: manually buffer reads from pickle stream
My previous fix (D8051, cb52e619c99e, which added Python's built-in buffering
to the pickle stream) has the problem that the selector will ignore the buffer.
When multiple pickled objects are read from the pipe into the buffer at once,
only one object will be loaded.
This can repeat until the buffer is full and delays the processing of completed
items until the worker exits, at which point the pipe is always considered
readable and all remaining items are processed.
This changeset reverts D8051, removing the buffer again. Instead, on Python 3
only, we use a wrapper to modify the "read" provided to the Unpickler to behave
more like a buffered read. We never read more bytes from the pipe than the
Unpickler requests, so the selector behaves as expected.
Also add a test case for "pickle data was truncated" issue.
https://phab.mercurial-scm.org/D8051#119193
Differential Revision: https://phab.mercurial-scm.org/D8076
author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> |
---|---|
date | Tue, 04 Feb 2020 22:07:36 +0100 |
parents | 1ddb296e0dee |
children |
line wrap: on
line source
$ cat >> $HGRCPATH << EOF > [extensions] > fastannotate= > EOF $ hg init repo $ cd repo $ for i in 0 1 2 3 4; do > echo $i >> a > echo $i >> b > hg commit -A -m $i a b > done use the "debugbuildannotatecache" command to build annotate cache at rev 0 $ hg debugbuildannotatecache --debug --config fastannotate.mainbranch=0 fastannotate: a: 1 new changesets in the main branch fastannotate: b: 1 new changesets in the main branch "debugbuildannotatecache" should work with broken cache (and other files would be built without being affected). note: linelog being broken is only noticed when we try to append to it. $ echo 'CORRUPT!' >> .hg/fastannotate/default/a.m $ hg debugbuildannotatecache --debug --config fastannotate.mainbranch=1 fastannotate: a: rebuilding broken cache fastannotate: a: 2 new changesets in the main branch fastannotate: b: 1 new changesets in the main branch $ echo 'CANNOT REUSE!' > .hg/fastannotate/default/a.l $ hg debugbuildannotatecache --debug --config fastannotate.mainbranch=2 fastannotate: a: rebuilding broken cache fastannotate: a: 3 new changesets in the main branch fastannotate: b: 1 new changesets in the main branch $ rm .hg/fastannotate/default/a.m $ hg debugbuildannotatecache --debug --config fastannotate.mainbranch=3 fastannotate: a: rebuilding broken cache fastannotate: a: 4 new changesets in the main branch fastannotate: b: 1 new changesets in the main branch $ rm .hg/fastannotate/default/a.l $ hg debugbuildannotatecache --debug --config fastannotate.mainbranch=3 $ hg debugbuildannotatecache --debug --config fastannotate.mainbranch=4 fastannotate: a: rebuilding broken cache fastannotate: a: 5 new changesets in the main branch fastannotate: b: 1 new changesets in the main branch "fastannotate" should deal with file corruption as well $ rm -rf .hg/fastannotate $ hg fastannotate --debug -r 0 a fastannotate: a: 1 new changesets in the main branch 0: 0 $ echo 'CORRUPT!' >> .hg/fastannotate/default/a.m $ hg fastannotate --debug -r 0 a fastannotate: a: cache broken and deleted fastannotate: a: 1 new changesets in the main branch 0: 0 $ echo 'CORRUPT!' > .hg/fastannotate/default/a.l $ hg fastannotate --debug -r 1 a fastannotate: a: cache broken and deleted fastannotate: a: 2 new changesets in the main branch 0: 0 1: 1 $ rm .hg/fastannotate/default/a.l $ hg fastannotate --debug -r 1 a fastannotate: a: using fast path (resolved fctx: True) fastannotate: a: cache broken and deleted fastannotate: a: 2 new changesets in the main branch 0: 0 1: 1 $ rm .hg/fastannotate/default/a.m $ hg fastannotate --debug -r 2 a fastannotate: a: cache broken and deleted fastannotate: a: 3 new changesets in the main branch 0: 0 1: 1 2: 2