[PATCH] largefiles: optimize update speed by only updating changed largefiles

Na'Tosha Bard natosha at unity3d.com
Mon Feb 13 17:37:48 UTC 2012


# HG changeset patch
# User Na'Tosha Bard <natosha at unity3d.com>
# Date 1329154627 -3600
# Node ID 47ee41fcf42bff3d3e0d635d1d8d2e4f4806311c
# Parent  cb756482c1aad808add481a6967e2eb7a5aead21
largefiles: optimize update speed by only updating changed largefiles

Historically, during 'hg update', every largefile in the working copy was
hashed (which is a very expensive operation on big files) and any
largefiles that did not have a hash that matched their standin were
updated.

This patch optimizes 'hg update' by keeping track of what standins have
changed between the old and new revisions, and only updating the largefiles
that have changed.  This saves a lot of time by avoiding the unecessary
calculation of a list of sha1 hashes for big files.

With this patch, the time 'hg update' takes to complete is a function of
how many largefiles need to be updated and what their size is.

Performance tests on a repository with about 80 largefiles ranging from
a few MB to about 97 MB are shown below.  The tests show how long it takes
to run 'hg update' with no changes actually being updated.

Mercurial 2.1 release:

$ time hg update
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
0 largefiles updated, 0 removed

real    0m10.045s
user    0m9.367s
sys    0m0.674s

With this patch:

$ time hg update
0 files updated, 0 files merged, 0 files removed, 0 files unresolved

real    0m0.965s
user    0m0.845s
sys    0m0.115s

The same repsoitory, without the largefiles extension enabled:

$ time hg update
0 files updated, 0 files merged, 0 files removed, 0 files unresolved

real    0m0.799s
user    0m0.684s
sys    0m0.111s

So before the patch, 'hg update' with no changes was approximately 9.25s
slower with largefiles enabled.  With this patch, it is approximately 0.165s
slower.

diff -r cb756482c1aa -r 47ee41fcf42b hgext/largefiles/lfutil.py
--- a/hgext/largefiles/lfutil.py	Fri Feb 10 17:09:23 2012 -0600
+++ b/hgext/largefiles/lfutil.py	Mon Feb 13 18:37:07 2012 +0100
@@ -457,3 +457,11 @@
         newheads = repo.branchheads(branch)
         heads = heads + newheads
     return heads
+
+def getstandinsstate(repo):
+    standins = []
+    matcher = getstandinmatcher(repo)
+    for standin in dirstate_walk(repo.dirstate, matcher):
+        lfile = splitstandin(standin)
+        standins.append((lfile, readstandin(repo, lfile)))
+    return standins
diff -r cb756482c1aa -r 47ee41fcf42b hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py	Fri Feb 10 17:09:23 2012 -0600
+++ b/hgext/largefiles/overrides.py	Mon Feb 13 18:37:07 2012 +0100
@@ -602,8 +602,20 @@
         wlock.release()
 
 def hg_update(orig, repo, node):
+    # In order to not waste a lot of extra time during the update largefiles
+    # step, we keep track of the state of the standins before and after we
+    # call the original update function, and only update the standins that
+    # have changed in the hg.update() call
+    oldstandins = lfutil.getstandinsstate(repo)
     result = orig(repo, node)
-    lfcommands.updatelfiles(repo.ui, repo)
+    newstandins = lfutil.getstandinsstate(repo)
+    tobeupdated = set(oldstandins).symmetric_difference(set(newstandins))
+    filelist = []
+    for f in tobeupdated:
+        if f[0] not in filelist:
+            filelist.append(f[0])
+
+    lfcommands.updatelfiles(repo.ui, repo, filelist=filelist, printmessage=True)
     return result
 
 def hg_clean(orig, repo, node, show_stats=True):



More information about the Mercurial-devel mailing list