This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3270

largefiles: use command executor for batch operation
ClosedPublic

Authored by indygreg on Apr 11 2018, 7:42 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG6c55ce51d6c3: largefiles: use command executor for batch operation
Summary

This is the only other user of iterbatch() in core.

Tests changed because the new command executor is smart enough
to not send a "batch" command over the wire if only 1 command
was requested.

There is still coverage for the "batch" command in this test
though.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Apr 11 2018, 7:42 PM
indygreg updated this revision to Diff 8123.Apr 13 2018, 3:14 PM
durin42 accepted this revision.Apr 13 2018, 5:35 PM
This revision is now accepted and ready to land.Apr 13 2018, 5:35 PM
Closed by commit rHG6c55ce51d6c3: largefiles: use command executor for batch operation (authored by indygreg). · Explain WhyApr 13 2018, 5:45 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 8168

hgext/largefiles/wirestore.py

def _get(self, hash): def _get(self, hash):
return self.remote.getlfile(hash) return self.remote.getlfile(hash)
def _stat(self, hashes): def _stat(self, hashes):
'''For each hash, return 0 if it is available, other values if not. '''For each hash, return 0 if it is available, other values if not.
It is usually 2 if the largefile is missing, but might be 1 the server It is usually 2 if the largefile is missing, but might be 1 the server
has a corrupted copy.''' has a corrupted copy.'''
batch = self.remote.iterbatch()
with self.remote.commandexecutor() as e:
fs = []
for hash in hashes: for hash in hashes:
batch.statlfile(hash) fs.append((hash, e.callcommand('statlfile', {
batch.submit() 'sha': hash,
return dict(zip(hashes, batch.results())) })))
return {hash: f.result() for hash, f in fs}

tests/test-largefiles-wireproto.t

branchmerge: False, force: False, partial: False branchmerge: False, force: False, partial: False
ancestor: 000000000000, local: 000000000000+, remote: cf03e5bb9936 ancestor: 000000000000, local: 000000000000+, remote: cf03e5bb9936
.hglf/f1: remote created -> g .hglf/f1: remote created -> g
getting .hglf/f1 getting .hglf/f1
updating: .hglf/f1 1/1 files (100.00%) updating: .hglf/f1 1/1 files (100.00%)
getting changed largefiles getting changed largefiles
using http://localhost:$HGPORT2/ using http://localhost:$HGPORT2/
sending capabilities command sending capabilities command
sending batch command sending statlfile command
getting largefiles: 0/1 files (0.00%) getting largefiles: 0/1 files (0.00%)
getting f1:02a439e5c31c526465ab1a0ca1f431f76b827b90 getting f1:02a439e5c31c526465ab1a0ca1f431f76b827b90
sending getlfile command sending getlfile command
found 02a439e5c31c526465ab1a0ca1f431f76b827b90 in store found 02a439e5c31c526465ab1a0ca1f431f76b827b90 in store
1 largefiles updated, 0 removed 1 largefiles updated, 0 removed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ ls http-clone-usercache/* $ ls http-clone-usercache/*
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
3 files, 3 changesets, 3 total revisions 3 files, 3 changesets, 3 total revisions
searching 3 changesets for largefiles searching 3 changesets for largefiles
verified existence of 3 revisions of 3 largefiles verified existence of 3 revisions of 3 largefiles
$ tail -1 access.log $ tail -1 access.log
$LOCALIP - - [$LOGDATE$] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=statlfile+sha%3Dc8559c3c9cfb42131794b7d8009230403b9b454c x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob) $LOCALIP - - [$LOGDATE$] "GET /?cmd=statlfile HTTP/1.1" 200 - x-hgarg-1:sha=c8559c3c9cfb42131794b7d8009230403b9b454c x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
$ killdaemons.py $ killdaemons.py
largefiles should not ask for password again after successful authorization largefiles should not ask for password again after successful authorization
$ hg init credentialmain $ hg init credentialmain
$ cd credentialmain $ cd credentialmain
$ echo "aaa" >> a $ echo "aaa" >> a