185269 2018-05-03 14:42:12 -0700 Range bisector should check the commits for repositories without change in specified range. 2022-02-09 10:14:32 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified NEW InRadar P2 Normal --- 1 dewei_zhu webkit-unassigned dewei_zhu rniwa webkit-bug-importer oldest_to_newest 1420351 0 dewei_zhu 2018-05-03 14:42:12 -0700 Range bisector should check the commits for repositories without change in specified range. 1420357 1 339472 dewei_zhu 2018-05-03 14:53:32 -0700 Created attachment 339472 Patch 1420366 2 dewei_zhu 2018-05-03 15:09:18 -0700 rdar://problem/39916741 1420401 3 339472 rniwa 2018-05-03 16:11:22 -0700 Comment on attachment 339472 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=339472&action=review > Websites/perf.webkit.org/ChangeLog:8 > + For the repositories those do not have change in specified range, we still need to use them This is kind of wordy. How about "For repositories without a change in the specified range, > Websites/perf.webkit.org/ChangeLog:9 > + to filter commit sets. You need to explain why we need to do that. In a way, what you've stated so far is "what". We need "why". > Websites/perf.webkit.org/public/v3/commit-set-range-bisector.js:19 > + const topLevelRepositoriesWithCommitHasOrdering = firstCommitSet.topLevelRepositories() This phrase isn't grammatically correct. topLevelRepositoriesWithOrderedCommits? > Websites/perf.webkit.org/unit-tests/commit-set-range-bisector-tests.js:666 > + it('should use still check the repository revision even the repository has no change in the range', async () => { should still check or should still use? Can't have two verbs. 1420449 4 339488 dewei_zhu 2018-05-03 17:03:43 -0700 Created attachment 339488 Patch 1422143 5 339488 rniwa 2018-05-08 22:55:55 -0700 Comment on attachment 339488 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=339488&action=review > Websites/perf.webkit.org/ChangeLog:16 > + (async): Remove this? > Websites/perf.webkit.org/public/v3/commit-set-range-bisector.js:35 > + let commits = null; > + if (startCommit !== endCommit) > + commits = await CommitLog.fetchBetweenRevisions(repository, startCommit.revision(), endCommit.revision()); > + else > + commits = [startCommit]; How about just this? cont commits = startCommit == endCommit ? [startCommit] : await CommitLog.fetchBetweenRevisions(repository, startCommit.revision(), endCommit.revision()); 339472 2018-05-03 14:53:32 -0700 2018-05-03 17:03:42 -0700 Patch bug-185269-20180503145331.patch text/plain 10181 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxMzI0CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBmODhlYTE1NGVmYmJmZDk4N2VjZWRlMmE1MTM3NGJlZjQzYmNmMWRhLi44YmIwYjgxODU5 Y2Q2ZWM4MDAwM2ZlNTdkZmIxMzIxMWI4YTIyZGVkIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxOC0wNS0wMyAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBSYW5nZSBiaXNlY3RvciBzaG91bGQgY2hlY2sgdGhlIGNv bW1pdHMgZm9yIHJlcG9zaXRvcmllcyB3aXRob3V0IGNoYW5nZSBpbiBzcGVjaWZpZWQgcmFuZ2Uu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODUyNjkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3IgdGhl IHJlcG9zaXRvcmllcyB0aG9zZSBkbyBub3QgaGF2ZSBjaGFuZ2UgaW4gc3BlY2lmaWVkIHJhbmdl LCB3ZSBzdGlsbCBuZWVkIHRvIHVzZSB0aGVtCisgICAgICAgIHRvIGZpbHRlciBjb21taXQgc2V0 cy4KKworICAgICAgICAqIHB1YmxpYy92My9jb21taXQtc2V0LXJhbmdlLWJpc2VjdG9yLmpzOiBV cGRhdGVkIHRoZSBsb2dpYyB0byB2ZXJpZnkgcmFuZ2UgZm9yIHJlcG9zaXRvcmllcworICAgICAg ICB3aGljaCBkb2VzIG5vdCBjaGFuZ2UgaW4gcmFuZ2UuCisgICAgICAgIChDb21taXRTZXRSYW5n ZUJpc2VjdG9yLmFzeW5jLmNvbW1pdFNldENsb3Nlc3RUb01pZGRsZU9mQWxsQ29tbWl0cyk6Cisg ICAgICAgICogdW5pdC10ZXN0cy9jb21taXQtc2V0LXJhbmdlLWJpc2VjdG9yLXRlc3RzLmpzOiBB ZGRlZCBhIHVuaXQgdGVzdCB0byBndWFyZCBhZ2FpbnN0IHRoaXMgY2hhbmdlLgorICAgICAgICAo YXN5bmMpOgorCiAyMDE4LTA1LTAyICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgog CiAgICAgICAgIENyZWF0ZSBhbmFseXNpcyB0YXNrIHNob3VsZCBzeW5jIGFuYWx5c2lzIHRhc2sg c3RhdHVzIGFmdGVyIGNyZWF0aW9uLgpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQu b3JnL3B1YmxpYy92My9jb21taXQtc2V0LXJhbmdlLWJpc2VjdG9yLmpzIGIvV2Vic2l0ZXMvcGVy Zi53ZWJraXQub3JnL3B1YmxpYy92My9jb21taXQtc2V0LXJhbmdlLWJpc2VjdG9yLmpzCmluZGV4 IGU0Nzg0NzQxNWY5ODBhNzYwNDgyNGJjMjM4NTY3ZTVjMzg0ZjVlNjEuLmNkNWI1NGVmN2I3NjA3 Yjk2YWJhY2RkOTdhZjlhYTAwMjZlNjcxNzMgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Vi a2l0Lm9yZy9wdWJsaWMvdjMvY29tbWl0LXNldC1yYW5nZS1iaXNlY3Rvci5qcworKysgYi9XZWJz aXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL2NvbW1pdC1zZXQtcmFuZ2UtYmlzZWN0b3Iu anMKQEAgLTE2LDE4ICsxNiwyNCBAQCBjbGFzcyBDb21taXRTZXRSYW5nZUJpc2VjdG9yIHsKICAg ICAgICAgY29uc3QgY29tbWl0UmFuZ2VCeVJlcG9zaXRvcnkgPSBuZXcgTWFwOwogICAgICAgICBj b25zdCBpbmRleEZvckFsbFRpbWVsZXNzQ29tbWl0c1dpdGhPcmRlckJ5UmVwb3NpdG9yeSA9IG5l dyBNYXA7CiAgICAgICAgIGNvbnN0IGFsbENvbW1pdHNXaXRoQ29tbWl0VGltZSA9IFtdOwotICAg ICAgICBjb25zdCB0b3BMZXZlbFJlcG9zaXRvcmllc1dpdGhDb21taXRDaGFuZ2UgPSBmaXJzdENv bW1pdFNldC50b3BMZXZlbFJlcG9zaXRvcmllcygpCisgICAgICAgIGNvbnN0IHRvcExldmVsUmVw b3NpdG9yaWVzV2l0aENvbW1pdEhhc09yZGVyaW5nID0gZmlyc3RDb21taXRTZXQudG9wTGV2ZWxS ZXBvc2l0b3JpZXMoKQogICAgICAgICAgICAgLmZpbHRlcigocmVwb3NpdG9yeSkgPT4gewogICAg ICAgICAgICAgICAgIGNvbnN0IGZpcnN0Q29tbWl0ID0gZmlyc3RDb21taXRTZXQuY29tbWl0Rm9y UmVwb3NpdG9yeShyZXBvc2l0b3J5KTsKICAgICAgICAgICAgICAgICBjb25zdCBzZWNvbmRDb21t aXQgPSBzZWNvbmRDb21taXRTZXQuY29tbWl0Rm9yUmVwb3NpdG9yeShyZXBvc2l0b3J5KTsKLSAg ICAgICAgICAgICAgICByZXR1cm4gZmlyc3RDb21taXQgIT09IHNlY29uZENvbW1pdCAmJiBDb21t aXRMb2cuaGFzT3JkZXJpbmcoZmlyc3RDb21taXQsIHNlY29uZENvbW1pdCk7CisgICAgICAgICAg ICAgICAgcmV0dXJuIENvbW1pdExvZy5oYXNPcmRlcmluZyhmaXJzdENvbW1pdCwgc2Vjb25kQ29t bWl0KTsKICAgICAgICAgICAgIH0pOwogCi0gICAgICAgIGF3YWl0IFByb21pc2UuYWxsKHRvcExl dmVsUmVwb3NpdG9yaWVzV2l0aENvbW1pdENoYW5nZS5tYXAoYXN5bmMgKHJlcG9zaXRvcnkpID0+ IHsKKyAgICAgICAgYXdhaXQgUHJvbWlzZS5hbGwodG9wTGV2ZWxSZXBvc2l0b3JpZXNXaXRoQ29t bWl0SGFzT3JkZXJpbmcubWFwKGFzeW5jIChyZXBvc2l0b3J5KSA9PiB7CiAgICAgICAgICAgICBj b25zdCBmaXJzdENvbW1pdCA9IGZpcnN0Q29tbWl0U2V0LmNvbW1pdEZvclJlcG9zaXRvcnkocmVw b3NpdG9yeSk7CiAgICAgICAgICAgICBjb25zdCBzZWNvbmRDb21taXQgPSBzZWNvbmRDb21taXRT ZXQuY29tbWl0Rm9yUmVwb3NpdG9yeShyZXBvc2l0b3J5KTsKICAgICAgICAgICAgIGNvbnN0IFtz dGFydENvbW1pdCwgZW5kQ29tbWl0XSA9IENvbW1pdExvZy5vcmRlclR3b0NvbW1pdHMoZmlyc3RD b21taXQsIHNlY29uZENvbW1pdCk7Ci0gICAgICAgICAgICBjb25zdCBjb21taXRzID0gYXdhaXQg Q29tbWl0TG9nLmZldGNoQmV0d2VlblJldmlzaW9ucyhyZXBvc2l0b3J5LCBzdGFydENvbW1pdC5y ZXZpc2lvbigpLCBlbmRDb21taXQucmV2aXNpb24oKSk7CisKKyAgICAgICAgICAgIGxldCBjb21t aXRzID0gbnVsbDsKKyAgICAgICAgICAgIGlmIChzdGFydENvbW1pdCAhPT0gZW5kQ29tbWl0KQor ICAgICAgICAgICAgICAgIGNvbW1pdHMgPSBhd2FpdCBDb21taXRMb2cuZmV0Y2hCZXR3ZWVuUmV2 aXNpb25zKHJlcG9zaXRvcnksIHN0YXJ0Q29tbWl0LnJldmlzaW9uKCksIGVuZENvbW1pdC5yZXZp c2lvbigpKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBjb21taXRzID0gW3N0 YXJ0Q29tbWl0XTsKKwogICAgICAgICAgICAgaWYgKHN0YXJ0Q29tbWl0Lmhhc0NvbW1pdFRpbWUo KSkgewogICAgICAgICAgICAgICAgIGFsbENvbW1pdHNXaXRoQ29tbWl0VGltZS5wdXNoKHN0YXJ0 Q29tbWl0LCAuLi5jb21taXRzKTsKICAgICAgICAgICAgICAgICBjb21taXRSYW5nZUJ5UmVwb3Np dG9yeS5zZXQocmVwb3NpdG9yeSwgKGNvbW1pdCkgPT4KZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3Bl cmYud2Via2l0Lm9yZy91bml0LXRlc3RzL2NvbW1pdC1zZXQtcmFuZ2UtYmlzZWN0b3ItdGVzdHMu anMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9jb21taXQtc2V0LXJhbmdl LWJpc2VjdG9yLXRlc3RzLmpzCmluZGV4IGI1YWUyMDIwZTUwZTQ2MTdjNDkxZDA1ZGY2YWEwMjIw OTNjZjQxZDguLjg2YzU0OTI1Y2EyZjVlYTE2ZGM1MDcxNTMwMzliYjUyM2Q4NWYyN2UgMTAwNjQ0 Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy91bml0LXRlc3RzL2NvbW1pdC1zZXQtcmFu Z2UtYmlzZWN0b3ItdGVzdHMuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQt dGVzdHMvY29tbWl0LXNldC1yYW5nZS1iaXNlY3Rvci10ZXN0cy5qcwpAQCAtMTQwLDYgKzE0MCw1 NCBAQCBkZXNjcmliZSgnQ29tbWl0U2V0UmFuZ2VCaXNlY3RvcicsICgpID0+IHsKICAgICAgICAg XTsKICAgICB9CiAKKyAgICBmdW5jdGlvbiBjb21taXRTZXRzV2l0Q29tbWl0Um9sbGJhY2soKQor ICAgIHsKKyAgICAgICAgcmV0dXJuIFsKKyAgICAgICAgICAgIENvbW1pdFNldC5lbnN1cmVTaW5n bGV0b24oMTEsIHsKKyAgICAgICAgICAgICAgICByZXZpc2lvbkl0ZW1zOiBbCisgICAgICAgICAg ICAgICAgICAgIHsgY29tbWl0OiBtYWtlQ29tbWl0KDEsIE1vY2tNb2RlbHMud2Via2l0LCAnd2Vi a2l0LWNvbW1pdC0xJywgMTApLCByZXF1aXJlc0J1aWxkOiBmYWxzZSB9LAorICAgICAgICAgICAg ICAgICAgICB7IGNvbW1pdDogbWFrZUNvbW1pdCgxMSwgTW9ja01vZGVscy5vc3gsICdvc3gtY29t bWl0LTEnLCAxKSwgcmVxdWlyZXNCdWlsZDogZmFsc2UgfSwKKyAgICAgICAgICAgICAgICAgICAg eyBjb21taXQ6IG1ha2VDb21taXQoMjAxLCBNb2NrTW9kZWxzLm93bmVyUmVwb3NpdG9yeSwgJ293 bmVyLWNvbW1pdC0xJywgMCwgMSksIHJlcXVpcmVzQnVpbGQ6IGZhbHNlIH0KKyAgICAgICAgICAg ICAgICBdLAorICAgICAgICAgICAgICAgIGN1c3RvbVJvb3RzOiBbXX0pLAorICAgICAgICAgICAg Q29tbWl0U2V0LmVuc3VyZVNpbmdsZXRvbigxMiwgeworICAgICAgICAgICAgICAgIHJldmlzaW9u SXRlbXM6IFsKKyAgICAgICAgICAgICAgICAgICAgeyBjb21taXQ6IG1ha2VDb21taXQoMSwgTW9j a01vZGVscy53ZWJraXQsICd3ZWJraXQtY29tbWl0LTEnLCAxMCksIHJlcXVpcmVzQnVpbGQ6IGZh bHNlIH0sCisgICAgICAgICAgICAgICAgICAgIHsgY29tbWl0OiBtYWtlQ29tbWl0KDEyLCBNb2Nr TW9kZWxzLm9zeCwgJ29zeC1jb21taXQtMicsIDIxKSwgcmVxdWlyZXNCdWlsZDogZmFsc2UgfSwK KyAgICAgICAgICAgICAgICAgICAgeyBjb21taXQ6IG1ha2VDb21taXQoMjAyLCBNb2NrTW9kZWxz Lm93bmVyUmVwb3NpdG9yeSwgJ293bmVyLWNvbW1pdC0yJywgMCwgMiksIHJlcXVpcmVzQnVpbGQ6 IGZhbHNlIH0KKyAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgIGN1c3RvbVJvb3Rz OiBbXX0pLAorICAgICAgICAgICAgQ29tbWl0U2V0LmVuc3VyZVNpbmdsZXRvbigxMywgeworICAg ICAgICAgICAgICAgIHJldmlzaW9uSXRlbXM6IFsKKyAgICAgICAgICAgICAgICAgICAgeyBjb21t aXQ6IG1ha2VDb21taXQoMiwgTW9ja01vZGVscy53ZWJraXQsICd3ZWJraXQtY29tbWl0LTInLCAy MCksIHJlcXVpcmVzQnVpbGQ6IGZhbHNlIH0sCisgICAgICAgICAgICAgICAgICAgIHsgY29tbWl0 OiBtYWtlQ29tbWl0KDEyLCBNb2NrTW9kZWxzLm9zeCwgJ29zeC1jb21taXQtMicsIDIxKSwgcmVx dWlyZXNCdWlsZDogZmFsc2UgfSwKKyAgICAgICAgICAgICAgICAgICAgeyBjb21taXQ6IG1ha2VD b21taXQoMjAyLCBNb2NrTW9kZWxzLm93bmVyUmVwb3NpdG9yeSwgJ293bmVyLWNvbW1pdC0yJywg MCwgMiksIHJlcXVpcmVzQnVpbGQ6IGZhbHNlIH0KKyAgICAgICAgICAgICAgICBdLAorICAgICAg ICAgICAgICAgIGN1c3RvbVJvb3RzOiBbXX0pLAorICAgICAgICAgICAgQ29tbWl0U2V0LmVuc3Vy ZVNpbmdsZXRvbigxNCwgeworICAgICAgICAgICAgICAgIHJldmlzaW9uSXRlbXM6IFsKKyAgICAg ICAgICAgICAgICAgICAgeyBjb21taXQ6IG1ha2VDb21taXQoMywgTW9ja01vZGVscy53ZWJraXQs ICd3ZWJraXQtY29tbWl0LTMnLCAzMCksIHJlcXVpcmVzQnVpbGQ6IGZhbHNlIH0sCisgICAgICAg ICAgICAgICAgICAgIHsgY29tbWl0OiBtYWtlQ29tbWl0KDEzLCBNb2NrTW9kZWxzLm9zeCwgJ29z eC1jb21taXQtMycsIDMxKSwgcmVxdWlyZXNCdWlsZDogZmFsc2UgfSwKKyAgICAgICAgICAgICAg ICAgICAgeyBjb21taXQ6IG1ha2VDb21taXQoMjAyLCBNb2NrTW9kZWxzLm93bmVyUmVwb3NpdG9y eSwgJ293bmVyLWNvbW1pdC0yJywgMCwgMiksIHJlcXVpcmVzQnVpbGQ6IGZhbHNlIH0KKyAgICAg ICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgIGN1c3RvbVJvb3RzOiBbXX0pLAorICAgICAg ICAgICAgQ29tbWl0U2V0LmVuc3VyZVNpbmdsZXRvbigxNSwgeworICAgICAgICAgICAgICAgIHJl dmlzaW9uSXRlbXM6IFsKKyAgICAgICAgICAgICAgICAgICAgeyBjb21taXQ6IG1ha2VDb21taXQo MywgTW9ja01vZGVscy53ZWJraXQsICd3ZWJraXQtY29tbWl0LTMnLCAzMCksIHJlcXVpcmVzQnVp bGQ6IGZhbHNlIH0sCisgICAgICAgICAgICAgICAgICAgIHsgY29tbWl0OiBtYWtlQ29tbWl0KDEz LCBNb2NrTW9kZWxzLm9zeCwgJ29zeC1jb21taXQtMycsIDMxKSwgcmVxdWlyZXNCdWlsZDogZmFs c2UgfSwKKyAgICAgICAgICAgICAgICAgICAgeyBjb21taXQ6IG1ha2VDb21taXQoMjAzLCBNb2Nr TW9kZWxzLm93bmVyUmVwb3NpdG9yeSwgJ293bmVyLWNvbW1pdC0zJywgMCwgMyksIHJlcXVpcmVz QnVpbGQ6IGZhbHNlIH0KKyAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAgIGN1c3Rv bVJvb3RzOiBbXX0pLAorICAgICAgICAgICAgQ29tbWl0U2V0LmVuc3VyZVNpbmdsZXRvbigxNywg eworICAgICAgICAgICAgICAgIHJldmlzaW9uSXRlbXM6IFsKKyAgICAgICAgICAgICAgICAgICAg eyBjb21taXQ6IG1ha2VDb21taXQoNiwgTW9ja01vZGVscy53ZWJraXQsICd3ZWJraXQtY29tbWl0 LTYnLCA2MCksIHJlcXVpcmVzQnVpbGQ6IGZhbHNlIH0sCisgICAgICAgICAgICAgICAgICAgIHsg Y29tbWl0OiBtYWtlQ29tbWl0KDEzLCBNb2NrTW9kZWxzLm9zeCwgJ29zeC1jb21taXQtMycsIDMx KSwgcmVxdWlyZXNCdWlsZDogZmFsc2UgfSwKKyAgICAgICAgICAgICAgICAgICAgeyBjb21taXQ6 IG1ha2VDb21taXQoMjAxLCBNb2NrTW9kZWxzLm93bmVyUmVwb3NpdG9yeSwgJ293bmVyLWNvbW1p dC0xJywgMCwgMSksIHJlcXVpcmVzQnVpbGQ6IGZhbHNlIH0KKyAgICAgICAgICAgICAgICBdLAor ICAgICAgICAgICAgICAgIGN1c3RvbVJvb3RzOiBbXX0pLAorICAgICAgICBdOworICAgIH0KKwog ICAgIGZ1bmN0aW9uIGNvbW1pdFNldHNXaXRoU29tZUhhdmVPd25lZENvbW1pdHMoKQogICAgIHsK ICAgICAgICAgcmV0dXJuIFsKQEAgLTYxNSw2ICs2NjMsNzkgQEAgZGVzY3JpYmUoJ0NvbW1pdFNl dFJhbmdlQmlzZWN0b3InLCAoKSA9PiB7CiAgICAgICAgICAgICBhc3NlcnQuZXF1YWwoYXdhaXQg cHJvbWlzZSwgYWxsQ29tbWl0U2V0c1szXSk7CiAgICAgICAgIH0pOwogCisgICAgICAgIGl0KCdz aG91bGQgdXNlIHN0aWxsIGNoZWNrIHRoZSByZXBvc2l0b3J5IHJldmlzaW9uIGV2ZW4gdGhlIHJl cG9zaXRvcnkgaGFzIG5vIGNoYW5nZSBpbiB0aGUgcmFuZ2UnLCBhc3luYyAoKSA9PiB7CisgICAg ICAgICAgICBjb25zdCBhbGxDb21taXRTZXRzID0gY29tbWl0U2V0c1dpdENvbW1pdFJvbGxiYWNr KCk7CisgICAgICAgICAgICBjb25zdCBzdGFydENvbW1pdFNldCA9IGFsbENvbW1pdFNldHNbMF07 CisgICAgICAgICAgICBjb25zdCBlbmRDb21taXRTZXQgPSBhbGxDb21taXRTZXRzW2FsbENvbW1p dFNldHMubGVuZ3RoIC0gMV07CisgICAgICAgICAgICBjb25zdCBwcm9taXNlID0gQ29tbWl0U2V0 UmFuZ2VCaXNlY3Rvci5jb21taXRTZXRDbG9zZXN0VG9NaWRkbGVPZkFsbENvbW1pdHMoW3N0YXJ0 Q29tbWl0U2V0LCBlbmRDb21taXRTZXRdLCBhbGxDb21taXRTZXRzKTsKKyAgICAgICAgICAgIGNv bnN0IHdlYmtpdElkID0gTW9ja01vZGVscy53ZWJraXQuaWQoKTsKKyAgICAgICAgICAgIGNvbnN0 IG9zeElkID0gTW9ja01vZGVscy5vc3guaWQoKTsKKworICAgICAgICAgICAgYXNzZXJ0LmVxdWFs KHJlcXVlc3RzLmxlbmd0aCwgMik7CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVxdWVzdHNb MF0udXJsLCAnL2FwaS9jb21taXRzLzkvP3ByZWNlZGluZ1JldmlzaW9uPW9zeC1jb21taXQtMSZs YXN0UmV2aXNpb249b3N4LWNvbW1pdC0zJyk7CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVx dWVzdHNbMV0udXJsLCAnL2FwaS9jb21taXRzLzExLz9wcmVjZWRpbmdSZXZpc2lvbj13ZWJraXQt Y29tbWl0LTEmbGFzdFJldmlzaW9uPXdlYmtpdC1jb21taXQtNicpOworCisgICAgICAgICAgICBy ZXF1ZXN0c1swXS5yZXNvbHZlKHsKKyAgICAgICAgICAgICAgICAnY29tbWl0cyc6IFsKKyAgICAg ICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICAgICAgcmVwb3NpdG9yeTogb3N4 SWQsCisgICAgICAgICAgICAgICAgICAgICAgICBpZDogMTIsCisgICAgICAgICAgICAgICAgICAg ICAgICByZXZpc2lvbjogJ29zeC1jb21taXQtMicsCisgICAgICAgICAgICAgICAgICAgICAgICBv d25zQ29tbWl0czogZmFsc2UsCisgICAgICAgICAgICAgICAgICAgICAgICB0aW1lOiAyMQorICAg ICAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAg ICAgICAgICAgICByZXBvc2l0b3J5OiBvc3hJZCwKKyAgICAgICAgICAgICAgICAgICAgICAgIGlk OiAxMywKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldmlzaW9uOiAnb3N4LWNvbW1pdC0zJywK KyAgICAgICAgICAgICAgICAgICAgICAgIG93bnNDb21taXRzOiBmYWxzZSwKKyAgICAgICAgICAg ICAgICAgICAgICAgIHRpbWU6IDMxCisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg ICAgICBdCisgICAgICAgICAgICB9KTsKKworICAgICAgICAgICAgcmVxdWVzdHNbMV0ucmVzb2x2 ZSh7CisgICAgICAgICAgICAgICAgJ2NvbW1pdHMnOiBbCisgICAgICAgICAgICAgICAgICAgIHsK KyAgICAgICAgICAgICAgICAgICAgICAgIHJlcG9zaXRvcnk6IHdlYmtpdElkLAorICAgICAgICAg ICAgICAgICAgICAgICAgaWQ6IDIsCisgICAgICAgICAgICAgICAgICAgICAgICByZXZpc2lvbjog J3dlYmtpdC1jb21taXQtMicsCisgICAgICAgICAgICAgICAgICAgICAgICBvd25zQ29tbWl0czog ZmFsc2UsCisgICAgICAgICAgICAgICAgICAgICAgICB0aW1lOiAyMAorICAgICAgICAgICAgICAg ICAgICB9LAorICAgICAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICBy ZXBvc2l0b3J5OiB3ZWJraXRJZCwKKyAgICAgICAgICAgICAgICAgICAgICAgIGlkOiAzLAorICAg ICAgICAgICAgICAgICAgICAgICAgcmV2aXNpb246ICd3ZWJraXQtY29tbWl0LTMnLAorICAgICAg ICAgICAgICAgICAgICAgICAgb3duc0NvbW1pdHM6IGZhbHNlLAorICAgICAgICAgICAgICAgICAg ICAgICAgdGltZTogMzAKKyAgICAgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICAg ICAgeworICAgICAgICAgICAgICAgICAgICAgICAgcmVwb3NpdG9yeTogd2Via2l0SWQsCisgICAg ICAgICAgICAgICAgICAgICAgICBpZDogNCwKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldmlz aW9uOiAnd2Via2l0LWNvbW1pdC00JywKKyAgICAgICAgICAgICAgICAgICAgICAgIG93bnNDb21t aXRzOiBmYWxzZSwKKyAgICAgICAgICAgICAgICAgICAgICAgIHRpbWU6IDQwCisgICAgICAgICAg ICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAg ICAgIHJlcG9zaXRvcnk6IHdlYmtpdElkLAorICAgICAgICAgICAgICAgICAgICAgICAgaWQ6IDUs CisgICAgICAgICAgICAgICAgICAgICAgICByZXZpc2lvbjogJ3dlYmtpdC1jb21taXQtNScsCisg ICAgICAgICAgICAgICAgICAgICAgICBvd25zQ29tbWl0czogZmFsc2UsCisgICAgICAgICAgICAg ICAgICAgICAgICB0aW1lOiA1MAorICAgICAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAg ICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICByZXBvc2l0b3J5OiB3ZWJraXRJZCwK KyAgICAgICAgICAgICAgICAgICAgICAgIGlkOiA2LAorICAgICAgICAgICAgICAgICAgICAgICAg cmV2aXNpb246ICd3ZWJraXQtY29tbWl0LTYnLAorICAgICAgICAgICAgICAgICAgICAgICAgb3du c0NvbW1pdHM6IGZhbHNlLAorICAgICAgICAgICAgICAgICAgICAgICAgdGltZTogNjAKKyAgICAg ICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICBdCisgICAgICAgICAgICB9KTsKKyAg ICAgICAgICAgIGFzc2VydC5lcXVhbChhd2FpdCBwcm9taXNlLCBudWxsKTsKKyAgICAgICAgfSk7 CisKICAgICAgICAgaXQoJ3Nob3VsZCBmaWx0ZXIgb3V0IGNvbW1pdCBzZXQgd2l0aCBvd25lZCBj b21taXQnLCBhc3luYyAoKSA9PiB7CiAgICAgICAgICAgICBjb25zdCBhbGxDb21taXRTZXRzID0g Y29tbWl0U2V0c1dpdGhTb21lSGF2ZU93bmVkQ29tbWl0cygpOwogICAgICAgICAgICAgY29uc3Qg c3RhcnRDb21taXRTZXQgPSBhbGxDb21taXRTZXRzWzBdOwo= 339488 2018-05-03 17:03:43 -0700 2018-05-08 22:55:55 -0700 Patch bug-185269-20180503170343.patch text/plain 10367 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxMzI0CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBmODhlYTE1NGVmYmJmZDk4N2VjZWRlMmE1MTM3NGJlZjQzYmNmMWRhLi42ZGUxMTY2YTk3 OTc1YmNjODA1NzQ4OGY0MDQ3NWIzYmJjNTIyYzlhIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxOC0wNS0wMyAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBSYW5nZSBiaXNlY3RvciBzaG91bGQgY2hlY2sgdGhlIGNv bW1pdHMgZm9yIHJlcG9zaXRvcmllcyB3aXRob3V0IGNoYW5nZSBpbiBzcGVjaWZpZWQgcmFuZ2Uu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODUyNjkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3IgcmVw b3NpdG9yaWVzIHdpdGhvdXQgYSBjaGFuZ2UgaW4gdGhlIHNwZWNpZmllZCByYW5nZSwgd2Ugc3Rp bGwgbmVlZCB0byB1c2UgdGhlbSB0byBmaWx0ZXIgY29tbWl0CisgICAgICAgIHNldHMuIEJlZm9y ZSB0aGlzIGNoYW5nZSwgY29kZSBkb2VzIG5vdCBhcHBseSBmaWx0ZXJpbmcgYnkgdGhvc2UgcmVw b3NpdG9yaWVzIGFnYWluc3QgY29tbWl0IHNldC4gQXMKKyAgICAgICAgYSByZXN1bHQsIGNvbW1p dCBzZXRzIHdpdGggZGlmZmVyZW50IGNvbW1pdHMgZm9yIHRob3NlIHJlcG9zaXRvcmllcyBtYXkg YmUgY2hvc2VuIGFzIGJpc2VjdGluZyBjb21taXQgc2V0LgorCisgICAgICAgICogcHVibGljL3Yz L2NvbW1pdC1zZXQtcmFuZ2UtYmlzZWN0b3IuanM6IFVwZGF0ZWQgdGhlIGxvZ2ljIHRvIHZlcmlm eSByYW5nZSBmb3IgcmVwb3NpdG9yaWVzIHdpdGhvdXQKKyAgICAgICAgY2hhbmdlIGluIHJhbmdl LgorICAgICAgICAoQ29tbWl0U2V0UmFuZ2VCaXNlY3Rvci5hc3luYy5jb21taXRTZXRDbG9zZXN0 VG9NaWRkbGVPZkFsbENvbW1pdHMpOgorICAgICAgICAqIHVuaXQtdGVzdHMvY29tbWl0LXNldC1y YW5nZS1iaXNlY3Rvci10ZXN0cy5qczogQWRkZWQgYSB1bml0IHRlc3QgdG8gZ3VhcmQgYWdhaW5z dCB0aGlzIGNoYW5nZS4KKyAgICAgICAgKGFzeW5jKToKKwogMjAxOC0wNS0wMiAgRGV3ZWkgWmh1 ICA8ZGV3ZWlfemh1QGFwcGxlLmNvbT4KIAogICAgICAgICBDcmVhdGUgYW5hbHlzaXMgdGFzayBz aG91bGQgc3luYyBhbmFseXNpcyB0YXNrIHN0YXR1cyBhZnRlciBjcmVhdGlvbi4KZGlmZiAtLWdp dCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvY29tbWl0LXNldC1yYW5nZS1i aXNlY3Rvci5qcyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvY29tbWl0LXNl dC1yYW5nZS1iaXNlY3Rvci5qcwppbmRleCBlNDc4NDc0MTVmOTgwYTc2MDQ4MjRiYzIzODU2N2U1 YzM4NGY1ZTYxLi5kYTI5N2M0ZDZiMzMwZTlkM2MyMTI4ZDIxOTE0YzFhMDQ3NjY0MzZmIDEwMDY0 NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL2NvbW1pdC1zZXQtcmFu Z2UtYmlzZWN0b3IuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9j b21taXQtc2V0LXJhbmdlLWJpc2VjdG9yLmpzCkBAIC0xNiwxOCArMTYsMjQgQEAgY2xhc3MgQ29t bWl0U2V0UmFuZ2VCaXNlY3RvciB7CiAgICAgICAgIGNvbnN0IGNvbW1pdFJhbmdlQnlSZXBvc2l0 b3J5ID0gbmV3IE1hcDsKICAgICAgICAgY29uc3QgaW5kZXhGb3JBbGxUaW1lbGVzc0NvbW1pdHNX aXRoT3JkZXJCeVJlcG9zaXRvcnkgPSBuZXcgTWFwOwogICAgICAgICBjb25zdCBhbGxDb21taXRz V2l0aENvbW1pdFRpbWUgPSBbXTsKLSAgICAgICAgY29uc3QgdG9wTGV2ZWxSZXBvc2l0b3JpZXNX aXRoQ29tbWl0Q2hhbmdlID0gZmlyc3RDb21taXRTZXQudG9wTGV2ZWxSZXBvc2l0b3JpZXMoKQor ICAgICAgICBjb25zdCB0b3BMZXZlbFJlcG9zaXRvcmllc1dpdGhPcmRlcmVkQ29tbWl0cyA9IGZp cnN0Q29tbWl0U2V0LnRvcExldmVsUmVwb3NpdG9yaWVzKCkKICAgICAgICAgICAgIC5maWx0ZXIo KHJlcG9zaXRvcnkpID0+IHsKICAgICAgICAgICAgICAgICBjb25zdCBmaXJzdENvbW1pdCA9IGZp cnN0Q29tbWl0U2V0LmNvbW1pdEZvclJlcG9zaXRvcnkocmVwb3NpdG9yeSk7CiAgICAgICAgICAg ICAgICAgY29uc3Qgc2Vjb25kQ29tbWl0ID0gc2Vjb25kQ29tbWl0U2V0LmNvbW1pdEZvclJlcG9z aXRvcnkocmVwb3NpdG9yeSk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIGZpcnN0Q29tbWl0ICE9 PSBzZWNvbmRDb21taXQgJiYgQ29tbWl0TG9nLmhhc09yZGVyaW5nKGZpcnN0Q29tbWl0LCBzZWNv bmRDb21taXQpOworICAgICAgICAgICAgICAgIHJldHVybiBDb21taXRMb2cuaGFzT3JkZXJpbmco Zmlyc3RDb21taXQsIHNlY29uZENvbW1pdCk7CiAgICAgICAgICAgICB9KTsKIAotICAgICAgICBh d2FpdCBQcm9taXNlLmFsbCh0b3BMZXZlbFJlcG9zaXRvcmllc1dpdGhDb21taXRDaGFuZ2UubWFw KGFzeW5jIChyZXBvc2l0b3J5KSA9PiB7CisgICAgICAgIGF3YWl0IFByb21pc2UuYWxsKHRvcExl dmVsUmVwb3NpdG9yaWVzV2l0aE9yZGVyZWRDb21taXRzLm1hcChhc3luYyAocmVwb3NpdG9yeSkg PT4gewogICAgICAgICAgICAgY29uc3QgZmlyc3RDb21taXQgPSBmaXJzdENvbW1pdFNldC5jb21t aXRGb3JSZXBvc2l0b3J5KHJlcG9zaXRvcnkpOwogICAgICAgICAgICAgY29uc3Qgc2Vjb25kQ29t bWl0ID0gc2Vjb25kQ29tbWl0U2V0LmNvbW1pdEZvclJlcG9zaXRvcnkocmVwb3NpdG9yeSk7CiAg ICAgICAgICAgICBjb25zdCBbc3RhcnRDb21taXQsIGVuZENvbW1pdF0gPSBDb21taXRMb2cub3Jk ZXJUd29Db21taXRzKGZpcnN0Q29tbWl0LCBzZWNvbmRDb21taXQpOwotICAgICAgICAgICAgY29u c3QgY29tbWl0cyA9IGF3YWl0IENvbW1pdExvZy5mZXRjaEJldHdlZW5SZXZpc2lvbnMocmVwb3Np dG9yeSwgc3RhcnRDb21taXQucmV2aXNpb24oKSwgZW5kQ29tbWl0LnJldmlzaW9uKCkpOworCisg ICAgICAgICAgICBsZXQgY29tbWl0cyA9IG51bGw7CisgICAgICAgICAgICBpZiAoc3RhcnRDb21t aXQgIT09IGVuZENvbW1pdCkKKyAgICAgICAgICAgICAgICBjb21taXRzID0gYXdhaXQgQ29tbWl0 TG9nLmZldGNoQmV0d2VlblJldmlzaW9ucyhyZXBvc2l0b3J5LCBzdGFydENvbW1pdC5yZXZpc2lv bigpLCBlbmRDb21taXQucmV2aXNpb24oKSk7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAg ICAgICAgY29tbWl0cyA9IFtzdGFydENvbW1pdF07CisKICAgICAgICAgICAgIGlmIChzdGFydENv bW1pdC5oYXNDb21taXRUaW1lKCkpIHsKICAgICAgICAgICAgICAgICBhbGxDb21taXRzV2l0aENv bW1pdFRpbWUucHVzaChzdGFydENvbW1pdCwgLi4uY29tbWl0cyk7CiAgICAgICAgICAgICAgICAg Y29tbWl0UmFuZ2VCeVJlcG9zaXRvcnkuc2V0KHJlcG9zaXRvcnksIChjb21taXQpID0+CmRpZmYg LS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9jb21taXQtc2V0LXJh bmdlLWJpc2VjdG9yLXRlc3RzLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQtdGVz dHMvY29tbWl0LXNldC1yYW5nZS1iaXNlY3Rvci10ZXN0cy5qcwppbmRleCBiNWFlMjAyMGU1MGU0 NjE3YzQ5MWQwNWRmNmFhMDIyMDkzY2Y0MWQ4Li5iZGFlMzBlZmNmZjE5N2IxNmMzZGEwZGYwNjU2 ODRlM2M5MzU5MjllIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10 ZXN0cy9jb21taXQtc2V0LXJhbmdlLWJpc2VjdG9yLXRlc3RzLmpzCisrKyBiL1dlYnNpdGVzL3Bl cmYud2Via2l0Lm9yZy91bml0LXRlc3RzL2NvbW1pdC1zZXQtcmFuZ2UtYmlzZWN0b3ItdGVzdHMu anMKQEAgLTE0MCw2ICsxNDAsNTQgQEAgZGVzY3JpYmUoJ0NvbW1pdFNldFJhbmdlQmlzZWN0b3In LCAoKSA9PiB7CiAgICAgICAgIF07CiAgICAgfQogCisgICAgZnVuY3Rpb24gY29tbWl0U2V0c1dp dENvbW1pdFJvbGxiYWNrKCkKKyAgICB7CisgICAgICAgIHJldHVybiBbCisgICAgICAgICAgICBD b21taXRTZXQuZW5zdXJlU2luZ2xldG9uKDExLCB7CisgICAgICAgICAgICAgICAgcmV2aXNpb25J dGVtczogWworICAgICAgICAgICAgICAgICAgICB7IGNvbW1pdDogbWFrZUNvbW1pdCgxLCBNb2Nr TW9kZWxzLndlYmtpdCwgJ3dlYmtpdC1jb21taXQtMScsIDEwKSwgcmVxdWlyZXNCdWlsZDogZmFs c2UgfSwKKyAgICAgICAgICAgICAgICAgICAgeyBjb21taXQ6IG1ha2VDb21taXQoMTEsIE1vY2tN b2RlbHMub3N4LCAnb3N4LWNvbW1pdC0xJywgMSksIHJlcXVpcmVzQnVpbGQ6IGZhbHNlIH0sCisg ICAgICAgICAgICAgICAgICAgIHsgY29tbWl0OiBtYWtlQ29tbWl0KDIwMSwgTW9ja01vZGVscy5v d25lclJlcG9zaXRvcnksICdvd25lci1jb21taXQtMScsIDAsIDEpLCByZXF1aXJlc0J1aWxkOiBm YWxzZSB9CisgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICBjdXN0b21Sb290czog W119KSwKKyAgICAgICAgICAgIENvbW1pdFNldC5lbnN1cmVTaW5nbGV0b24oMTIsIHsKKyAgICAg ICAgICAgICAgICByZXZpc2lvbkl0ZW1zOiBbCisgICAgICAgICAgICAgICAgICAgIHsgY29tbWl0 OiBtYWtlQ29tbWl0KDEsIE1vY2tNb2RlbHMud2Via2l0LCAnd2Via2l0LWNvbW1pdC0xJywgMTAp LCByZXF1aXJlc0J1aWxkOiBmYWxzZSB9LAorICAgICAgICAgICAgICAgICAgICB7IGNvbW1pdDog bWFrZUNvbW1pdCgxMiwgTW9ja01vZGVscy5vc3gsICdvc3gtY29tbWl0LTInLCAyMSksIHJlcXVp cmVzQnVpbGQ6IGZhbHNlIH0sCisgICAgICAgICAgICAgICAgICAgIHsgY29tbWl0OiBtYWtlQ29t bWl0KDIwMiwgTW9ja01vZGVscy5vd25lclJlcG9zaXRvcnksICdvd25lci1jb21taXQtMicsIDAs IDIpLCByZXF1aXJlc0J1aWxkOiBmYWxzZSB9CisgICAgICAgICAgICAgICAgXSwKKyAgICAgICAg ICAgICAgICBjdXN0b21Sb290czogW119KSwKKyAgICAgICAgICAgIENvbW1pdFNldC5lbnN1cmVT aW5nbGV0b24oMTMsIHsKKyAgICAgICAgICAgICAgICByZXZpc2lvbkl0ZW1zOiBbCisgICAgICAg ICAgICAgICAgICAgIHsgY29tbWl0OiBtYWtlQ29tbWl0KDIsIE1vY2tNb2RlbHMud2Via2l0LCAn d2Via2l0LWNvbW1pdC0yJywgMjApLCByZXF1aXJlc0J1aWxkOiBmYWxzZSB9LAorICAgICAgICAg ICAgICAgICAgICB7IGNvbW1pdDogbWFrZUNvbW1pdCgxMiwgTW9ja01vZGVscy5vc3gsICdvc3gt Y29tbWl0LTInLCAyMSksIHJlcXVpcmVzQnVpbGQ6IGZhbHNlIH0sCisgICAgICAgICAgICAgICAg ICAgIHsgY29tbWl0OiBtYWtlQ29tbWl0KDIwMiwgTW9ja01vZGVscy5vd25lclJlcG9zaXRvcnks ICdvd25lci1jb21taXQtMicsIDAsIDIpLCByZXF1aXJlc0J1aWxkOiBmYWxzZSB9CisgICAgICAg ICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICBjdXN0b21Sb290czogW119KSwKKyAgICAgICAg ICAgIENvbW1pdFNldC5lbnN1cmVTaW5nbGV0b24oMTQsIHsKKyAgICAgICAgICAgICAgICByZXZp c2lvbkl0ZW1zOiBbCisgICAgICAgICAgICAgICAgICAgIHsgY29tbWl0OiBtYWtlQ29tbWl0KDMs IE1vY2tNb2RlbHMud2Via2l0LCAnd2Via2l0LWNvbW1pdC0zJywgMzApLCByZXF1aXJlc0J1aWxk OiBmYWxzZSB9LAorICAgICAgICAgICAgICAgICAgICB7IGNvbW1pdDogbWFrZUNvbW1pdCgxMywg TW9ja01vZGVscy5vc3gsICdvc3gtY29tbWl0LTMnLCAzMSksIHJlcXVpcmVzQnVpbGQ6IGZhbHNl IH0sCisgICAgICAgICAgICAgICAgICAgIHsgY29tbWl0OiBtYWtlQ29tbWl0KDIwMiwgTW9ja01v ZGVscy5vd25lclJlcG9zaXRvcnksICdvd25lci1jb21taXQtMicsIDAsIDIpLCByZXF1aXJlc0J1 aWxkOiBmYWxzZSB9CisgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICBjdXN0b21S b290czogW119KSwKKyAgICAgICAgICAgIENvbW1pdFNldC5lbnN1cmVTaW5nbGV0b24oMTUsIHsK KyAgICAgICAgICAgICAgICByZXZpc2lvbkl0ZW1zOiBbCisgICAgICAgICAgICAgICAgICAgIHsg Y29tbWl0OiBtYWtlQ29tbWl0KDMsIE1vY2tNb2RlbHMud2Via2l0LCAnd2Via2l0LWNvbW1pdC0z JywgMzApLCByZXF1aXJlc0J1aWxkOiBmYWxzZSB9LAorICAgICAgICAgICAgICAgICAgICB7IGNv bW1pdDogbWFrZUNvbW1pdCgxMywgTW9ja01vZGVscy5vc3gsICdvc3gtY29tbWl0LTMnLCAzMSks IHJlcXVpcmVzQnVpbGQ6IGZhbHNlIH0sCisgICAgICAgICAgICAgICAgICAgIHsgY29tbWl0OiBt YWtlQ29tbWl0KDIwMywgTW9ja01vZGVscy5vd25lclJlcG9zaXRvcnksICdvd25lci1jb21taXQt MycsIDAsIDMpLCByZXF1aXJlc0J1aWxkOiBmYWxzZSB9CisgICAgICAgICAgICAgICAgXSwKKyAg ICAgICAgICAgICAgICBjdXN0b21Sb290czogW119KSwKKyAgICAgICAgICAgIENvbW1pdFNldC5l bnN1cmVTaW5nbGV0b24oMTcsIHsKKyAgICAgICAgICAgICAgICByZXZpc2lvbkl0ZW1zOiBbCisg ICAgICAgICAgICAgICAgICAgIHsgY29tbWl0OiBtYWtlQ29tbWl0KDYsIE1vY2tNb2RlbHMud2Vi a2l0LCAnd2Via2l0LWNvbW1pdC02JywgNjApLCByZXF1aXJlc0J1aWxkOiBmYWxzZSB9LAorICAg ICAgICAgICAgICAgICAgICB7IGNvbW1pdDogbWFrZUNvbW1pdCgxMywgTW9ja01vZGVscy5vc3gs ICdvc3gtY29tbWl0LTMnLCAzMSksIHJlcXVpcmVzQnVpbGQ6IGZhbHNlIH0sCisgICAgICAgICAg ICAgICAgICAgIHsgY29tbWl0OiBtYWtlQ29tbWl0KDIwMSwgTW9ja01vZGVscy5vd25lclJlcG9z aXRvcnksICdvd25lci1jb21taXQtMScsIDAsIDEpLCByZXF1aXJlc0J1aWxkOiBmYWxzZSB9Cisg ICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICBjdXN0b21Sb290czogW119KSwKKyAg ICAgICAgXTsKKyAgICB9CisKICAgICBmdW5jdGlvbiBjb21taXRTZXRzV2l0aFNvbWVIYXZlT3du ZWRDb21taXRzKCkKICAgICB7CiAgICAgICAgIHJldHVybiBbCkBAIC02MTUsNiArNjYzLDc5IEBA IGRlc2NyaWJlKCdDb21taXRTZXRSYW5nZUJpc2VjdG9yJywgKCkgPT4gewogICAgICAgICAgICAg YXNzZXJ0LmVxdWFsKGF3YWl0IHByb21pc2UsIGFsbENvbW1pdFNldHNbM10pOwogICAgICAgICB9 KTsKIAorICAgICAgICBpdCgnc2hvdWxkIHN0aWxsIGNoZWNrIHRoZSByZXBvc2l0b3J5IHJldmlz aW9uIGV2ZW4gdGhlIHJlcG9zaXRvcnkgaGFzIG5vIGNoYW5nZSBpbiB0aGUgcmFuZ2UnLCBhc3lu YyAoKSA9PiB7CisgICAgICAgICAgICBjb25zdCBhbGxDb21taXRTZXRzID0gY29tbWl0U2V0c1dp dENvbW1pdFJvbGxiYWNrKCk7CisgICAgICAgICAgICBjb25zdCBzdGFydENvbW1pdFNldCA9IGFs bENvbW1pdFNldHNbMF07CisgICAgICAgICAgICBjb25zdCBlbmRDb21taXRTZXQgPSBhbGxDb21t aXRTZXRzW2FsbENvbW1pdFNldHMubGVuZ3RoIC0gMV07CisgICAgICAgICAgICBjb25zdCBwcm9t aXNlID0gQ29tbWl0U2V0UmFuZ2VCaXNlY3Rvci5jb21taXRTZXRDbG9zZXN0VG9NaWRkbGVPZkFs bENvbW1pdHMoW3N0YXJ0Q29tbWl0U2V0LCBlbmRDb21taXRTZXRdLCBhbGxDb21taXRTZXRzKTsK KyAgICAgICAgICAgIGNvbnN0IHdlYmtpdElkID0gTW9ja01vZGVscy53ZWJraXQuaWQoKTsKKyAg ICAgICAgICAgIGNvbnN0IG9zeElkID0gTW9ja01vZGVscy5vc3guaWQoKTsKKworICAgICAgICAg ICAgYXNzZXJ0LmVxdWFsKHJlcXVlc3RzLmxlbmd0aCwgMik7CisgICAgICAgICAgICBhc3NlcnQu ZXF1YWwocmVxdWVzdHNbMF0udXJsLCAnL2FwaS9jb21taXRzLzkvP3ByZWNlZGluZ1JldmlzaW9u PW9zeC1jb21taXQtMSZsYXN0UmV2aXNpb249b3N4LWNvbW1pdC0zJyk7CisgICAgICAgICAgICBh c3NlcnQuZXF1YWwocmVxdWVzdHNbMV0udXJsLCAnL2FwaS9jb21taXRzLzExLz9wcmVjZWRpbmdS ZXZpc2lvbj13ZWJraXQtY29tbWl0LTEmbGFzdFJldmlzaW9uPXdlYmtpdC1jb21taXQtNicpOwor CisgICAgICAgICAgICByZXF1ZXN0c1swXS5yZXNvbHZlKHsKKyAgICAgICAgICAgICAgICAnY29t bWl0cyc6IFsKKyAgICAgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICAgICAg cmVwb3NpdG9yeTogb3N4SWQsCisgICAgICAgICAgICAgICAgICAgICAgICBpZDogMTIsCisgICAg ICAgICAgICAgICAgICAgICAgICByZXZpc2lvbjogJ29zeC1jb21taXQtMicsCisgICAgICAgICAg ICAgICAgICAgICAgICBvd25zQ29tbWl0czogZmFsc2UsCisgICAgICAgICAgICAgICAgICAgICAg ICB0aW1lOiAyMQorICAgICAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgICAgICAgICByZXBvc2l0b3J5OiBvc3hJZCwKKyAgICAgICAgICAg ICAgICAgICAgICAgIGlkOiAxMywKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldmlzaW9uOiAn b3N4LWNvbW1pdC0zJywKKyAgICAgICAgICAgICAgICAgICAgICAgIG93bnNDb21taXRzOiBmYWxz ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgIHRpbWU6IDMxCisgICAgICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICAgICBdCisgICAgICAgICAgICB9KTsKKworICAgICAgICAgICAgcmVx dWVzdHNbMV0ucmVzb2x2ZSh7CisgICAgICAgICAgICAgICAgJ2NvbW1pdHMnOiBbCisgICAgICAg ICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHJlcG9zaXRvcnk6IHdlYmtp dElkLAorICAgICAgICAgICAgICAgICAgICAgICAgaWQ6IDIsCisgICAgICAgICAgICAgICAgICAg ICAgICByZXZpc2lvbjogJ3dlYmtpdC1jb21taXQtMicsCisgICAgICAgICAgICAgICAgICAgICAg ICBvd25zQ29tbWl0czogZmFsc2UsCisgICAgICAgICAgICAgICAgICAgICAgICB0aW1lOiAyMAor ICAgICAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgICAgICB7CisgICAgICAgICAg ICAgICAgICAgICAgICByZXBvc2l0b3J5OiB3ZWJraXRJZCwKKyAgICAgICAgICAgICAgICAgICAg ICAgIGlkOiAzLAorICAgICAgICAgICAgICAgICAgICAgICAgcmV2aXNpb246ICd3ZWJraXQtY29t bWl0LTMnLAorICAgICAgICAgICAgICAgICAgICAgICAgb3duc0NvbW1pdHM6IGZhbHNlLAorICAg ICAgICAgICAgICAgICAgICAgICAgdGltZTogMzAKKyAgICAgICAgICAgICAgICAgICAgfSwKKyAg ICAgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICAgICAgcmVwb3NpdG9yeTog d2Via2l0SWQsCisgICAgICAgICAgICAgICAgICAgICAgICBpZDogNCwKKyAgICAgICAgICAgICAg ICAgICAgICAgIHJldmlzaW9uOiAnd2Via2l0LWNvbW1pdC00JywKKyAgICAgICAgICAgICAgICAg ICAgICAgIG93bnNDb21taXRzOiBmYWxzZSwKKyAgICAgICAgICAgICAgICAgICAgICAgIHRpbWU6 IDQwCisgICAgICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgICAgIHsKKyAgICAg ICAgICAgICAgICAgICAgICAgIHJlcG9zaXRvcnk6IHdlYmtpdElkLAorICAgICAgICAgICAgICAg ICAgICAgICAgaWQ6IDUsCisgICAgICAgICAgICAgICAgICAgICAgICByZXZpc2lvbjogJ3dlYmtp dC1jb21taXQtNScsCisgICAgICAgICAgICAgICAgICAgICAgICBvd25zQ29tbWl0czogZmFsc2Us CisgICAgICAgICAgICAgICAgICAgICAgICB0aW1lOiA1MAorICAgICAgICAgICAgICAgICAgICB9 LAorICAgICAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICByZXBvc2l0 b3J5OiB3ZWJraXRJZCwKKyAgICAgICAgICAgICAgICAgICAgICAgIGlkOiA2LAorICAgICAgICAg ICAgICAgICAgICAgICAgcmV2aXNpb246ICd3ZWJraXQtY29tbWl0LTYnLAorICAgICAgICAgICAg ICAgICAgICAgICAgb3duc0NvbW1pdHM6IGZhbHNlLAorICAgICAgICAgICAgICAgICAgICAgICAg dGltZTogNjAKKyAgICAgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICBdCisgICAg ICAgICAgICB9KTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChhd2FpdCBwcm9taXNlLCBudWxs KTsKKyAgICAgICAgfSk7CisKICAgICAgICAgaXQoJ3Nob3VsZCBmaWx0ZXIgb3V0IGNvbW1pdCBz ZXQgd2l0aCBvd25lZCBjb21taXQnLCBhc3luYyAoKSA9PiB7CiAgICAgICAgICAgICBjb25zdCBh bGxDb21taXRTZXRzID0gY29tbWl0U2V0c1dpdGhTb21lSGF2ZU93bmVkQ29tbWl0cygpOwogICAg ICAgICAgICAgY29uc3Qgc3RhcnRDb21taXRTZXQgPSBhbGxDb21taXRTZXRzWzBdOwo=