facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-11 01:07:15 +03:00
Code Issues Projects Releases Wiki Activity

copytrace: modifying retrievedata behavior

Browse Source 
Summary: Queries were too big

Test Plan: Former tests still pass, copytracing doesn't raise an exception on 10000 anymore.

Reviewers: #sourcecontrol, rmcelroy

Differential Revision: https://phabricator.fb.com/D2719221

Tasks: 8660367
This commit is contained in:
Cecile Berillon 2015-12-03 13:30:02 -08:00
parent 6064bfa18a
commit 6e113a18b5
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
copytrace/dbutil.py
View File

@ -220,22 +220,29 @@ def retrievedatapkg(repo, ctxlist, move=False, askserver=False, addmissing=True)
"""
retrieves {ctxhash: {dst: src}} for ctxhash in ctxlist for moves or copies
"""
# Checks if the database has the data, else, asks it to the server, or adds
# it manually
checkpresence(repo, ctxlist, askserver, addmissing)
dbname, conn, cursor = _connect(repo)
# Do we want moves or copies
mv = '1' if move else '0'
token = '%s' if repo.copytraceremote else '?'
# Returns : hash, src, dst
cursor.execute(_sqlcmds('retrievemoves', repo.copytraceremote) %
(','.join([token] * len(ctxlist)), token, token),
ctxlist + [mv, repo.root])
all_rows = []
length = len(ctxlist)
maxi = int(repo.ui.config('copytrace', 'maxquery', '500'))
# Cutting the query by a thousand so that it doesn't get too big
for i in range(0, length, maxi):
subctx = ctxlist[i:min(i + maxi, length)]
# Checks if the database has the data, else, asks it to the server,
# or adds it manually
checkpresence(repo, subctx, askserver, addmissing)
# Returns : hash, src, dst
cursor.execute(_sqlcmds('retrievemoves', repo.copytraceremote) %
(','.join([token] * len(subctx)), token, token),
subctx + [mv, repo.root])
all_rows.extend(cursor.fetchall())
all_rows = cursor.fetchall()
_close(conn, cursor)
ret = {}
@ -275,12 +282,18 @@ def retrieverawdata(repo, ctxlist):
dbname, conn, cursor = _connect(repo)
token = '%s' if repo.copytraceremote else '?'
# Returns: hash, src, dst, mv
cursor.execute(_sqlcmds('retrieveraw', repo.copytraceremote) %
(','.join([token] * len(ctxlist)), token),
ctxlist + [repo.root])
all_rows = []
length = len(ctxlist)
maxi = int(repo.ui.config('copytrace', 'maxquery', '500'))
# Cutting the query by a thousand so that it doesn't get too big
for i in range(0, length, maxi):
subctx = ctxlist[i:min(i+maxi, length)]
# Returns: hash, src, dst, mv
cursor.execute(_sqlcmds('retrieveraw', repo.copytraceremote) %
(','.join([token] * len(subctx)), token),
subctx + [repo.root])
all_rows.extend(cursor.fetchall())
all_rows = cursor.fetchall()
_close(conn, cursor)
return _builddict(all_rows)