undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-p4: reduce number of server queries for fetches

Browse Source 
When fetching changes from a depot using a full client spec, there
is no need to perform as many queries as there are top-level paths
in the client spec.  Instead we query all changes in chronological
order, also getting rid of the need to sort the results and remove
duplicates.

Signed-off-by: Sam Hocevar <sam@hocevar.net>
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Sam Hocevar 2015-12-19 09:39:40 +00:00 committed by Junio C Hamano
parent cbc692425c
commit 1f90a64891
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
git-p4.py
View File

@ -822,10 +822,8 @@ def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
die("cannot use --changes-block-size with non-numeric revisions") die("cannot use --changes-block-size with non-numeric revisions")
block_size = None block_size = None
# Accumulate change numbers in a dictionary to avoid duplicates changes = []
changes = {}
for p in depotPaths:
# Retrieve changes a block at a time, to prevent running # Retrieve changes a block at a time, to prevent running
# into a MaxResults/MaxScanRows error from the server. # into a MaxResults/MaxScanRows error from the server.
@ -838,11 +836,12 @@ def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
else: else:
revisionRange = "%s,%s" % (changeStart, changeEnd) revisionRange = "%s,%s" % (changeStart, changeEnd)
for p in depotPaths:
cmd += ["%s...@%s" % (p, revisionRange)] cmd += ["%s...@%s" % (p, revisionRange)]
for line in p4_read_pipe_lines(cmd): # Insert changes in chronological order
changeNum = int(line.split(" ")[1]) for line in reversed(p4_read_pipe_lines(cmd)):
changes[changeNum] = True changes.append(int(line.split(" ")[1]))
if not block_size: if not block_size:
break break
@ -852,9 +851,8 @@ def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
changeStart = end + 1 changeStart = end + 1
changelist = changes.keys() changes = sorted(changes)
changelist.sort() return changes
return changelist
def p4PathStartsWith(path, prefix): def p4PathStartsWith(path, prefix):
# This method tries to remedy a potential mixed-case issue: # This method tries to remedy a potential mixed-case issue:

2
t/t9818-git-p4-block.sh
View File

@ -128,7 +128,7 @@ test_expect_success 'Create a repo with multiple depot paths' '
done done
' '
test_expect_failure 'Clone repo with multiple depot paths' ' test_expect_success 'Clone repo with multiple depot paths' '
( (
cd "$git" && cd "$git" &&
git p4 clone --changes-block-size=4 //depot/pathA@all //depot/pathB@all \ git p4 clone --changes-block-size=4 //depot/pathA@all //depot/pathB@all \