Mercurial > hg
view tests/test-url.py @ 43198:c16fe77e340a
pathcopies: give up any optimization based on `introrev`
Between 8a0136f69027 and d98fb3f42f33, we sped up the search for the
introduction revision during path copies. However, further checking show that
finding the introduction revision is still expensive and that we are better off
without it. So we simply drop it and only rely on the linkrev optimisation.
I ran `perfpathcopies` on 6989 pair of revision in the pypy
repository (`hg perfhelper-pathcopies`. The result is massively in favor of
dropping this condition. The result of the copy tracing are unchanged.
Attempt to use a smaller changes preserving linkrev usage were unsuccessful, it
can return wrong result. The following changesets broke test-mv-cp-st-diff.t
- if not f.isintroducedafter(limit):
+ if limit >= 0 and f.linkrev() < limit:
return None
Here are various numbers (before this changeset/after this changesets)
source destination before after saved-time ratio
worth cases e66f24650daf 695dfb0f493b 1.062843 1.246369 -0.183526 1.172675
c979853a3b6a 8d60fe293e79 1.036985 1.196414 -0.159429 1.153743
22349fa2fc33 fbb1c9fd86c0 0.879926 1.038682 -0.158756 1.180420
682b98f3e672 a4878080a536 0.909952 1.063801 -0.153849 1.169074
5adabc9b9848 920958a93997 0.993622 1.147452 -0.153830 1.154817
worse 1% dbfbfcf077e9 aea8f2fd3593 1.016595 1.082999 -0.066404 1.065320
worse 5% c95f1ced15f2 7d29d5e39734 0.453694 0.471156 -0.017462 1.038488
worse 10% 3e144ed1d5b7 2aef0e942480 0.035140 0.037535 -0.002395 1.068156
worse 25% 321fc60db035 801748ba582a 0.009267 0.009325 -0.000058 1.006259
median 2088ce763fc2 e6991321d78b 0.000665 0.000651 0.000014 0.978947
best 25% 915631a97de6 385b31354be6 0.040743 0.040363 0.000380 0.990673
best 10% ad495c36a765 19c10384d3e7 0.431658 0.411490 0.020168 0.953278
best 5% d13ae7d283ae 813c99f810ac 1.141404 1.075346 0.066058 0.942126
best 1% 81593cb4a496 99ae11866969 1.833297 0.063823 1.769474 0.034813
best cases c3b14617fbd7 743a0fcaa4eb 1101.811740 2.735970 1099.075770 0.002483
c3b14617fbd7 9ba6ab77fd29 1116.753953 2.800729 1113.953224 0.002508
058b99d6e81f 57e249b7a3ea 1246.128485 3.042762 1243.085723 0.002442
9a8c361aab49 0354a250d371 1253.111894 3.085796 1250.026098 0.002463
442dbbc53c68 3ec1002a818c 1261.786294 3.138607 1258.647687 0.002487
As one can see, the average case is not really impacted. However, the worth case
we get after this changeset are much better than the one we had before it. We
have 30 pairs where improvements are above 10 minutes.
This reflect in the combined time for all pairs
before: 26256s
after: 1300s (-95%)
If we remove these pathological 30 cases, we still see a significant improvements:
before: 1631s
after: 1245s (-24%)
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 10 Oct 2019 03:49:33 +0200 |
parents | 2372284d9457 |
children | d2e1dcd4490d |
line wrap: on
line source
# coding=utf-8 from __future__ import absolute_import, print_function import doctest import os def check(a, b): if a != b: print((a, b)) def cert(cn): return {'subject': ((('commonName', cn),),)} from mercurial import sslutil _verifycert = sslutil._verifycert # Test non-wildcard certificates check(_verifycert(cert('example.com'), 'example.com'), None) check( _verifycert(cert('example.com'), 'www.example.com'), b'certificate is for example.com', ) check( _verifycert(cert('www.example.com'), 'example.com'), b'certificate is for www.example.com', ) # Test wildcard certificates check(_verifycert(cert('*.example.com'), 'www.example.com'), None) check( _verifycert(cert('*.example.com'), 'example.com'), b'certificate is for *.example.com', ) check( _verifycert(cert('*.example.com'), 'w.w.example.com'), b'certificate is for *.example.com', ) # Test subjectAltName san_cert = { 'subject': ((('commonName', 'example.com'),),), 'subjectAltName': (('DNS', '*.example.net'), ('DNS', 'example.net')), } check(_verifycert(san_cert, 'example.net'), None) check(_verifycert(san_cert, 'foo.example.net'), None) # no fallback to subject commonName when subjectAltName has DNS check( _verifycert(san_cert, 'example.com'), b'certificate is for *.example.net, example.net', ) # fallback to subject commonName when no DNS in subjectAltName san_cert = { 'subject': ((('commonName', 'example.com'),),), 'subjectAltName': (('IP Address', '8.8.8.8'),), } check(_verifycert(san_cert, 'example.com'), None) # Avoid some pitfalls check(_verifycert(cert('*.foo'), 'foo'), b'certificate is for *.foo') check(_verifycert(cert('*o'), 'foo'), None) check( _verifycert({'subject': ()}, 'example.com'), b'no commonName or subjectAltName found in certificate', ) check(_verifycert(None, 'example.com'), b'no certificate received') # Unicode (IDN) certname isn't supported check( _verifycert(cert(u'\u4f8b.jp'), 'example.jp'), b'IDN in certificate not supported', ) # The following tests are from CPython's test_ssl.py. check(_verifycert(cert('example.com'), 'example.com'), None) check(_verifycert(cert('example.com'), 'ExAmple.cOm'), None) check( _verifycert(cert('example.com'), 'www.example.com'), b'certificate is for example.com', ) check( _verifycert(cert('example.com'), '.example.com'), b'certificate is for example.com', ) check( _verifycert(cert('example.com'), 'example.org'), b'certificate is for example.com', ) check( _verifycert(cert('example.com'), 'exampleXcom'), b'certificate is for example.com', ) check(_verifycert(cert('*.a.com'), 'foo.a.com'), None) check( _verifycert(cert('*.a.com'), 'bar.foo.a.com'), b'certificate is for *.a.com' ) check(_verifycert(cert('*.a.com'), 'a.com'), b'certificate is for *.a.com') check(_verifycert(cert('*.a.com'), 'Xa.com'), b'certificate is for *.a.com') check(_verifycert(cert('*.a.com'), '.a.com'), b'certificate is for *.a.com') # only match one left-most wildcard check(_verifycert(cert('f*.com'), 'foo.com'), None) check(_verifycert(cert('f*.com'), 'f.com'), None) check(_verifycert(cert('f*.com'), 'bar.com'), b'certificate is for f*.com') check(_verifycert(cert('f*.com'), 'foo.a.com'), b'certificate is for f*.com') check(_verifycert(cert('f*.com'), 'bar.foo.com'), b'certificate is for f*.com') # NULL bytes are bad, CVE-2013-4073 check( _verifycert( cert('null.python.org\x00example.org'), 'null.python.org\x00example.org' ), None, ) check( _verifycert(cert('null.python.org\x00example.org'), 'example.org'), b'certificate is for null.python.org\x00example.org', ) check( _verifycert(cert('null.python.org\x00example.org'), 'null.python.org'), b'certificate is for null.python.org\x00example.org', ) # error cases with wildcards check( _verifycert(cert('*.*.a.com'), 'bar.foo.a.com'), b'certificate is for *.*.a.com', ) check(_verifycert(cert('*.*.a.com'), 'a.com'), b'certificate is for *.*.a.com') check(_verifycert(cert('*.*.a.com'), 'Xa.com'), b'certificate is for *.*.a.com') check(_verifycert(cert('*.*.a.com'), '.a.com'), b'certificate is for *.*.a.com') check(_verifycert(cert('a.*.com'), 'a.foo.com'), b'certificate is for a.*.com') check(_verifycert(cert('a.*.com'), 'a..com'), b'certificate is for a.*.com') check(_verifycert(cert('a.*.com'), 'a.com'), b'certificate is for a.*.com') # wildcard doesn't match IDNA prefix 'xn--' idna = u'püthon.python.org'.encode('idna').decode('ascii') check(_verifycert(cert(idna), idna), None) check( _verifycert(cert('x*.python.org'), idna), b'certificate is for x*.python.org', ) check( _verifycert(cert('xn--p*.python.org'), idna), b'certificate is for xn--p*.python.org', ) # wildcard in first fragment and IDNA A-labels in sequent fragments # are supported. idna = u'www*.pythön.org'.encode('idna').decode('ascii') check( _verifycert(cert(idna), u'www.pythön.org'.encode('idna').decode('ascii')), None, ) check( _verifycert(cert(idna), u'www1.pythön.org'.encode('idna').decode('ascii')), None, ) check( _verifycert(cert(idna), u'ftp.pythön.org'.encode('idna').decode('ascii')), b'certificate is for www*.xn--pythn-mua.org', ) check( _verifycert(cert(idna), u'pythön.org'.encode('idna').decode('ascii')), b'certificate is for www*.xn--pythn-mua.org', ) c = { 'notAfter': 'Jun 26 21:41:46 2011 GMT', 'subject': (((u'commonName', u'linuxfrz.org'),),), 'subjectAltName': ( ('DNS', 'linuxfr.org'), ('DNS', 'linuxfr.com'), ('othername', '<unsupported>'), ), } check(_verifycert(c, 'linuxfr.org'), None) check(_verifycert(c, 'linuxfr.com'), None) # Not a "DNS" entry check( _verifycert(c, '<unsupported>'), b'certificate is for linuxfr.org, linuxfr.com', ) # When there is a subjectAltName, commonName isn't used check( _verifycert(c, 'linuxfrz.org'), b'certificate is for linuxfr.org, linuxfr.com', ) # A pristine real-world example c = { 'notAfter': 'Dec 18 23:59:59 2011 GMT', 'subject': ( ((u'countryName', u'US'),), ((u'stateOrProvinceName', u'California'),), ((u'localityName', u'Mountain View'),), ((u'organizationName', u'Google Inc'),), ((u'commonName', u'mail.google.com'),), ), } check(_verifycert(c, 'mail.google.com'), None) check(_verifycert(c, 'gmail.com'), b'certificate is for mail.google.com') # Only commonName is considered check(_verifycert(c, 'California'), b'certificate is for mail.google.com') # Neither commonName nor subjectAltName c = { 'notAfter': 'Dec 18 23:59:59 2011 GMT', 'subject': ( ((u'countryName', u'US'),), ((u'stateOrProvinceName', u'California'),), ((u'localityName', u'Mountain View'),), ((u'organizationName', u'Google Inc'),), ), } check( _verifycert(c, 'mail.google.com'), b'no commonName or subjectAltName found in certificate', ) # No DNS entry in subjectAltName but a commonName c = { 'notAfter': 'Dec 18 23:59:59 2099 GMT', 'subject': ( ((u'countryName', u'US'),), ((u'stateOrProvinceName', u'California'),), ((u'localityName', u'Mountain View'),), ((u'commonName', u'mail.google.com'),), ), 'subjectAltName': (('othername', 'blabla'),), } check(_verifycert(c, 'mail.google.com'), None) # No DNS entry subjectAltName and no commonName c = { 'notAfter': 'Dec 18 23:59:59 2099 GMT', 'subject': ( ((u'countryName', u'US'),), ((u'stateOrProvinceName', u'California'),), ((u'localityName', u'Mountain View'),), ((u'organizationName', u'Google Inc'),), ), 'subjectAltName': (('othername', 'blabla'),), } check( _verifycert(c, 'google.com'), b'no commonName or subjectAltName found in certificate', ) # Empty cert / no cert check(_verifycert(None, 'example.com'), b'no certificate received') check(_verifycert({}, 'example.com'), b'no certificate received') # avoid denials of service by refusing more than one # wildcard per fragment. check( _verifycert({'subject': (((u'commonName', u'a*b.com'),),)}, 'axxb.com'), None, ) check( _verifycert({'subject': (((u'commonName', u'a*b.co*'),),)}, 'axxb.com'), b'certificate is for a*b.co*', ) check( _verifycert({'subject': (((u'commonName', u'a*b*.com'),),)}, 'axxbxxc.com'), b'too many wildcards in certificate DNS name: a*b*.com', ) def test_url(): """ >>> from mercurial import error, pycompat >>> from mercurial.util import url >>> from mercurial.utils.stringutil import forcebytestr This tests for edge cases in url.URL's parsing algorithm. Most of these aren't useful for documentation purposes, so they aren't part of the class's doc tests. Query strings and fragments: >>> url(b'http://host/a?b#c') <url scheme: 'http', host: 'host', path: 'a', query: 'b', fragment: 'c'> >>> url(b'http://host/a?') <url scheme: 'http', host: 'host', path: 'a'> >>> url(b'http://host/a#b#c') <url scheme: 'http', host: 'host', path: 'a', fragment: 'b#c'> >>> url(b'http://host/a#b?c') <url scheme: 'http', host: 'host', path: 'a', fragment: 'b?c'> >>> url(b'http://host/?a#b') <url scheme: 'http', host: 'host', path: '', query: 'a', fragment: 'b'> >>> url(b'http://host/?a#b', parsequery=False) <url scheme: 'http', host: 'host', path: '?a', fragment: 'b'> >>> url(b'http://host/?a#b', parsefragment=False) <url scheme: 'http', host: 'host', path: '', query: 'a#b'> >>> url(b'http://host/?a#b', parsequery=False, parsefragment=False) <url scheme: 'http', host: 'host', path: '?a#b'> IPv6 addresses: >>> url(b'ldap://[2001:db8::7]/c=GB?objectClass?one') <url scheme: 'ldap', host: '[2001:db8::7]', path: 'c=GB', query: 'objectClass?one'> >>> url(b'ldap://joe:xxx@[2001:db8::7]:80/c=GB?objectClass?one') <url scheme: 'ldap', user: 'joe', passwd: 'xxx', host: '[2001:db8::7]', port: '80', path: 'c=GB', query: 'objectClass?one'> Missing scheme, host, etc.: >>> url(b'://192.0.2.16:80/') <url path: '://192.0.2.16:80/'> >>> url(b'https://mercurial-scm.org') <url scheme: 'https', host: 'mercurial-scm.org'> >>> url(b'/foo') <url path: '/foo'> >>> url(b'bundle:/foo') <url scheme: 'bundle', path: '/foo'> >>> url(b'a?b#c') <url path: 'a?b', fragment: 'c'> >>> url(b'http://x.com?arg=/foo') <url scheme: 'http', host: 'x.com', query: 'arg=/foo'> >>> url(b'http://joe:xxx@/foo') <url scheme: 'http', user: 'joe', passwd: 'xxx', path: 'foo'> Just a scheme and a path: >>> url(b'mailto:John.Doe@example.com') <url scheme: 'mailto', path: 'John.Doe@example.com'> >>> url(b'a:b:c:d') <url path: 'a:b:c:d'> >>> url(b'aa:bb:cc:dd') <url scheme: 'aa', path: 'bb:cc:dd'> SSH examples: >>> url(b'ssh://joe@host//home/joe') <url scheme: 'ssh', user: 'joe', host: 'host', path: '/home/joe'> >>> url(b'ssh://joe:xxx@host/src') <url scheme: 'ssh', user: 'joe', passwd: 'xxx', host: 'host', path: 'src'> >>> url(b'ssh://joe:xxx@host') <url scheme: 'ssh', user: 'joe', passwd: 'xxx', host: 'host'> >>> url(b'ssh://joe@host') <url scheme: 'ssh', user: 'joe', host: 'host'> >>> url(b'ssh://host') <url scheme: 'ssh', host: 'host'> >>> url(b'ssh://') <url scheme: 'ssh'> >>> url(b'ssh:') <url scheme: 'ssh'> Non-numeric port: >>> url(b'http://example.com:dd') <url scheme: 'http', host: 'example.com', port: 'dd'> >>> url(b'ssh://joe:xxx@host:ssh/foo') <url scheme: 'ssh', user: 'joe', passwd: 'xxx', host: 'host', port: 'ssh', path: 'foo'> Bad authentication credentials: >>> url(b'http://joe@joeville:123@4:@host/a?b#c') <url scheme: 'http', user: 'joe@joeville', passwd: '123@4:', host: 'host', path: 'a', query: 'b', fragment: 'c'> >>> url(b'http://!*#?/@!*#?/:@host/a?b#c') <url scheme: 'http', host: '!*', fragment: '?/@!*#?/:@host/a?b#c'> >>> url(b'http://!*#?@!*#?:@host/a?b#c') <url scheme: 'http', host: '!*', fragment: '?@!*#?:@host/a?b#c'> >>> url(b'http://!*@:!*@@host/a?b#c') <url scheme: 'http', user: '!*@', passwd: '!*@', host: 'host', path: 'a', query: 'b', fragment: 'c'> File paths: >>> url(b'a/b/c/d.g.f') <url path: 'a/b/c/d.g.f'> >>> url(b'/x///z/y/') <url path: '/x///z/y/'> >>> url(b'/foo:bar') <url path: '/foo:bar'> >>> url(b'\\\\foo:bar') <url path: '\\\\foo:bar'> >>> url(b'./foo:bar') <url path: './foo:bar'> Non-localhost file URL: >>> try: ... u = url(b'file://mercurial-scm.org/foo') ... except error.Abort as e: ... forcebytestr(e) 'file:// URLs can only refer to localhost' Empty URL: >>> u = url(b'') >>> u <url path: ''> >>> str(u) '' Empty path with query string: >>> str(url(b'http://foo/?bar')) 'http://foo/?bar' Invalid path: >>> u = url(b'http://foo/bar') >>> u.path = b'bar' >>> str(u) 'http://foo/bar' >>> u = url(b'file:/foo/bar/baz') >>> u <url scheme: 'file', path: '/foo/bar/baz'> >>> str(u) 'file:///foo/bar/baz' >>> pycompat.bytestr(u.localpath()) '/foo/bar/baz' >>> u = url(b'file:///foo/bar/baz') >>> u <url scheme: 'file', path: '/foo/bar/baz'> >>> str(u) 'file:///foo/bar/baz' >>> pycompat.bytestr(u.localpath()) '/foo/bar/baz' >>> u = url(b'file:///f:oo/bar/baz') >>> u <url scheme: 'file', path: 'f:oo/bar/baz'> >>> str(u) 'file:///f:oo/bar/baz' >>> pycompat.bytestr(u.localpath()) 'f:oo/bar/baz' >>> u = url(b'file://localhost/f:oo/bar/baz') >>> u <url scheme: 'file', host: 'localhost', path: 'f:oo/bar/baz'> >>> str(u) 'file://localhost/f:oo/bar/baz' >>> pycompat.bytestr(u.localpath()) 'f:oo/bar/baz' >>> u = url(b'file:foo/bar/baz') >>> u <url scheme: 'file', path: 'foo/bar/baz'> >>> str(u) 'file:foo/bar/baz' >>> pycompat.bytestr(u.localpath()) 'foo/bar/baz' """ if 'TERM' in os.environ: del os.environ['TERM'] doctest.testmod(optionflags=doctest.NORMALIZE_WHITESPACE)