Mercurial > hg
view tests/test-extdata.t @ 37631:2f626233859b
wireproto: implement batching on peer executor interface
This is a bit more complicated than non-batch requests because we
need to buffer sends until the last request arrives *and* we need
to support resolving futures as data arrives from the remote.
In a classical concurrent.futures executor model, the future
"starts" as soon as it is submitted. However, we have nothing to
start until the last command is submitted.
If we did nothing, calling result() would deadlock, since the future
hasn't "started." So in the case where we queue the command, we return
a special future type whose result() will trigger sendcommands().
This eliminates the deadlock potential. It also serves as a check
against callers who may be calling result() prematurely, as it will
prevent any subsequent callcommands() from working. This behavior
is slightly annoying and a bit restrictive. But it's the world
that half duplex connections forces on us.
In order to support streaming responses, we were previously using
a generator. But with a futures-based API, we're using futures
and not generators. So in order to get streaming, we need a
background thread to read data from the server.
The approach taken in this patch is to leverage the ThreadPoolExecutor
from concurrent.futures for managing a background thread. We create
an executor and future that resolves when all response data is
processed (or an error occurs). When exiting the context manager,
we wait on that background reading before returning.
I was hoping we could manually spin up a threading.Thread and this
would be simple. But I ran into a few deadlocks when implementing.
After looking at the source code to concurrent.futures, I figured
it would just be easier to use a ThreadPoolExecutor than implement
all the code needed to manually manage a thread.
To prove this works, a use of the batch API in discovery has been
updated.
Differential Revision: https://phab.mercurial-scm.org/D3269
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Fri, 13 Apr 2018 11:02:34 -0700 |
parents | b1959391a088 |
children | faa41fd282d1 |
line wrap: on
line source
$ hg init repo $ cd repo $ for n in 0 1 2 3 4 5 6 7 8 9 10 11; do > echo $n > $n > hg ci -qAm $n > done test revset support $ cat <<'EOF' >> .hg/hgrc > [extdata] > filedata = file:extdata.txt > notes = notes.txt > shelldata = shell:cat extdata.txt | grep 2 > emptygrep = shell:cat extdata.txt | grep empty > EOF $ cat <<'EOF' > extdata.txt > 2 another comment on 2 > 3 > EOF $ cat <<'EOF' > notes.txt > f6ed this change is great! > e834 this is buggy :( > 0625 first post > bogusnode gives no error > a ambiguous node gives no error > EOF $ hg log -qr "extdata(filedata)" 2:f6ed99a58333 3:9de260b1e88e $ hg log -qr "extdata(shelldata)" 2:f6ed99a58333 test weight of extdata() revset $ hg debugrevspec -p optimized "extdata(filedata) & 3" * optimized: (andsmally (func (symbol 'extdata') (symbol 'filedata')) (symbol '3')) 3 test non-zero exit of shell command $ hg log -qr "extdata(emptygrep)" abort: extdata command 'cat extdata.txt | grep empty' failed: exited with status 1 [255] test bad extdata() revset source $ hg log -qr "extdata()" hg: parse error: extdata takes at least 1 string argument [255] $ hg log -qr "extdata(unknown)" abort: unknown extdata source 'unknown' [255] test template support: $ hg log -r:3 -T "{node|short}{if(extdata('notes'), ' # {extdata('notes')}')}\n" 06254b906311 # first post e8342c9a2ed1 # this is buggy :( f6ed99a58333 # this change is great! 9de260b1e88e test template cache: $ hg log -r:3 -T '{rev} "{extdata("notes")}" "{extdata("shelldata")}"\n' 0 "first post" "" 1 "this is buggy :(" "" 2 "this change is great!" "another comment on 2" 3 "" "" test bad extdata() template source $ hg log -T "{extdata()}\n" hg: parse error: extdata expects one argument [255] $ hg log -T "{extdata('unknown')}\n" abort: unknown extdata source 'unknown' [255] we don't fix up relative file URLs, but we do run shell commands in repo root $ mkdir sub $ cd sub $ hg log -qr "extdata(filedata)" abort: error: $ENOENT$ [255] $ hg log -qr "extdata(shelldata)" 2:f6ed99a58333 $ cd ..