comparison mercurial/debugcommands.py @ 38821:0a57945aaf7f

manifest: persist the manifestfulltext cache Reconstructing the manifest from the revlog takes time, so much so that there already is a LRU cache to avoid having to load a manifest multiple times. This patch persists that LRU cache in the .hg/cache directory, so we can re-use this cache across hg commands. Commit benchmark (run on Macos 10.13 on a 2017-model Macbook Pro with Core i7 2.9GHz and flash drive), testing without and with patch run 5 times, baseline is r2a227782e754: * committing to an existing file, against the mozilla-central repository. Baseline real time average 1.9692, with patch 1.3786. A new debugcommand "hg debugmanifestfulltextcache" lets you inspect the cache, clear it, or add specific manifest nodeids to it. When calling repo.updatecaches(), the manifest(s) for the working copy parents are added to the cache. The hg perfmanifest command has an additional --clear-disk switch to clear this cache when testing manifest loading performance. Using this command to test performance on the firefox repository for revision f947d902ed91, whose manifest has a delta chain length of 60540, we see: $ hg perfmanifest f947d902ed91 --clear-disk ! wall 0.972253 comb 0.970000 user 0.850000 sys 0.120000 (best of 10) $ hg debugmanifestfulltextcache -a `hg log --debug -r f947d902ed91 | grep manifest | cut -d: -f3` Cache contains 1 manifest entries, in order of most to least recent: id: 0294517df4aad07c70701db43bc7ff24c3ce7dbc, size 25.6 MB Total cache data size 25.6 MB, on-disk 0 bytes $ hg perfmanifest f947d902ed91 ! wall 0.036748 comb 0.040000 user 0.020000 sys 0.020000 (best of 100) Worst-case scenario: a manifest text loaded from a single delta; in the firefox repository manifest node 9a1246ff762e is the chain base for the manifest attached to revision f947d902ed91. Loading this from a full cache file is just as fast as without the cache; the extra node ids ensure a big full cache: $ for node in 9a1246ff762e 1a1922c14a3e 54a31d11a36a 0294517df4aa; do > hgd debugmanifestfulltextcache -a $node > /dev/null > done $ hgd perfmanifest -m 9a1246ff762e ! wall 0.077513 comb 0.080000 user 0.030000 sys 0.050000 (best of 100) $ hgd perfmanifest -m 9a1246ff762e --clear-disk ! wall 0.078547 comb 0.080000 user 0.070000 sys 0.010000 (best of 100)
author Martijn Pieters <mj@zopatista.com>
date Tue, 31 Jul 2018 19:37:54 +0200
parents 6b5ca1d0aa1e
children e7aa113b14f7
comparison
equal deleted inserted replaced
38820:ddb15a83ae0b 38821:0a57945aaf7f
1444 held += report(repo.svfs, "lock", repo.lock) 1444 held += report(repo.svfs, "lock", repo.lock)
1445 held += report(repo.vfs, "wlock", repo.wlock) 1445 held += report(repo.vfs, "wlock", repo.wlock)
1446 1446
1447 return held 1447 return held
1448 1448
1449 @command('debugmanifestfulltextcache', [
1450 ('', 'clear', False, _('clear the cache')),
1451 ('a', 'add', '', _('add the given manifest node to the cache'),
1452 _('NODE'))
1453 ], '')
1454 def debugmanifestfulltextcache(ui, repo, add=None, **opts):
1455 """show, clear or amend the contents of the manifest fulltext cache"""
1456 with repo.lock():
1457 r = repo.manifestlog._revlog
1458 try:
1459 cache = r._fulltextcache
1460 except AttributeError:
1461 ui.warn(_(
1462 "Current revlog implementation doesn't appear to have a "
1463 'manifest fulltext cache\n'))
1464 return
1465
1466 if opts.get(r'clear'):
1467 cache.clear()
1468
1469 if add:
1470 try:
1471 manifest = repo.manifestlog[r.lookup(add)]
1472 except error.LookupError as e:
1473 raise error.Abort(e, hint="Check your manifest node id")
1474 manifest.read() # stores revisision in cache too
1475
1476 if not len(cache):
1477 ui.write(_('Cache empty'))
1478 else:
1479 ui.write(
1480 _('Cache contains %d manifest entries, in order of most to '
1481 'least recent:\n') % (len(cache),))
1482 totalsize = 0
1483 for nodeid in cache:
1484 # Use cache.get to not update the LRU order
1485 data = cache.get(nodeid)
1486 size = len(data)
1487 totalsize += size + 24 # 20 bytes nodeid, 4 bytes size
1488 ui.write(_('id: %s, size %s\n') % (
1489 hex(nodeid), util.bytecount(size)))
1490 ondisk = cache._opener.stat('manifestfulltextcache').st_size
1491 ui.write(
1492 _('Total cache data size %s, on-disk %s\n') % (
1493 util.bytecount(totalsize), util.bytecount(ondisk))
1494 )
1495
1449 @command('debugmergestate', [], '') 1496 @command('debugmergestate', [], '')
1450 def debugmergestate(ui, repo, *args): 1497 def debugmergestate(ui, repo, *args):
1451 """print merge state 1498 """print merge state
1452 1499
1453 Use --verbose to print out information about whether v1 or v2 merge state 1500 Use --verbose to print out information about whether v1 or v2 merge state