Commit 1f90a648 authored by Sam Hocevar's avatar Sam Hocevar Committed by Junio C Hamano

git-p4: reduce number of server queries for fetches

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: default avatarSam Hocevar <[email protected]>
Signed-off-by: Luke Diamand's avatarLuke Diamand <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent cbc69242
......@@ -822,39 +822,37 @@ def p4ChangesForPaths(depotPaths, changeRange, requestedBlockSize):
die("cannot use --changes-block-size with non-numeric revisions")
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
# into a MaxResults/MaxScanRows error from the server.
# Retrieve changes a block at a time, to prevent running
# into a MaxResults/MaxScanRows error from the server.
while True:
cmd = ['changes']
while True:
cmd = ['changes']
if block_size:
end = min(changeEnd, changeStart + block_size)
revisionRange = "%d,%d" % (changeStart, end)
else:
revisionRange = "%s,%s" % (changeStart, changeEnd)
if block_size:
end = min(changeEnd, changeStart + block_size)
revisionRange = "%d,%d" % (changeStart, end)
else:
revisionRange = "%s,%s" % (changeStart, changeEnd)
for p in depotPaths:
cmd += ["%[email protected]%s" % (p, revisionRange)]
for line in p4_read_pipe_lines(cmd):
changeNum = int(line.split(" ")[1])
changes[changeNum] = True
# Insert changes in chronological order
for line in reversed(p4_read_pipe_lines(cmd)):
changes.append(int(line.split(" ")[1]))
if not block_size:
break
if not block_size:
break
if end >= changeEnd:
break
if end >= changeEnd:
break
changeStart = end + 1
changeStart = end + 1
changelist = changes.keys()
changelist.sort()
return changelist
changes = sorted(changes)
return changes
def p4PathStartsWith(path, prefix):
# This method tries to remedy a potential mixed-case issue:
......
......@@ -128,7 +128,7 @@ test_expect_success 'Create a repo with multiple depot paths' '
done
'
test_expect_failure 'Clone repo with multiple depot paths' '
test_expect_success 'Clone repo with multiple depot paths' '
(
cd "$git" &&
git p4 clone --changes-block-size=4 //depot/[email protected] //depot/[email protected] \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment