165215 2016-11-30 12:55:50 -0800 IndexedDB: When doing puts, don't do deletes if there are no indexes 2021-08-11 15:22:52 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified REOPENED P2 Normal --- 160306 165889 1 beidson beidson achristensen alecflett bfulgham commit-queue jsbell sihui_liu oldest_to_newest 1254907 0 beidson 2016-11-30 12:55:50 -0800 IndexedDB: When doing puts, don't do deletes if there are no indexes It's important to "delete before put" to make sure indexes are in a consistent state. But if an object store has no indexes, we shouldn't bother doing the deletes first. This saves between 1% and 2% on a tight-insert loop. 1254911 1 295745 beidson 2016-11-30 12:59:31 -0800 Created attachment 295745 Patch v1 1254916 2 beidson 2016-11-30 13:12:59 -0800 Well, this patch goes ahead and fails tests, so, never mind. 1254930 3 beidson 2016-11-30 13:22:25 -0800 I see the issue with half of this patch. RecordIDs in the table. There's also an issue of orphaned blobs. This might be worth revisiting in the future, but probably not now. I'll land the "good half" now, as it's still worthwhile. 1254932 4 295749 beidson 2016-11-30 13:25:31 -0800 Created attachment 295749 PFL 1254996 5 295749 commit-queue 2016-11-30 14:46:10 -0800 Comment on attachment 295749 PFL Rejecting attachment 295749 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 295749, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: /git.webkit.org/WebKit 0bc77eff..ec707a9 master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 209154 = 0bc77effebf4a1d87caf78b287e1348281916fc8 r209155 = ec707a9b4ab967b1a1b232f888e58a4d3dbab0fb Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: http://webkit-queues.webkit.org/results/2597527 1255114 6 295749 commit-queue 2016-11-30 18:42:49 -0800 Comment on attachment 295749 PFL Clearing flags on attachment: 295749 Committed r209168: <http://trac.webkit.org/changeset/209168> 1255115 7 commit-queue 2016-11-30 18:42:52 -0800 All reviewed patches have been landed. Closing bug. 1255168 8 beidson 2016-11-30 23:06:07 -0800 Reverted r209168 for reason: Caused 2 API tests to fail Committed r209176: <http://trac.webkit.org/changeset/209176> 1255170 9 beidson 2016-11-30 23:07:28 -0800 (In reply to comment #8) > Reverted r209168 for reason: > > Caused 2 API tests to fail > > Committed r209176: <http://trac.webkit.org/changeset/209176> In case we want to revisit this (some day...) exploration on the two failing tests is here: https://bugs.webkit.org/show_bug.cgi?id=165242 295745 2016-11-30 12:59:31 -0800 2016-11-30 13:13:18 -0800 Patch v1 patch text/plain 5041 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5MDA1NDRlLi4yYWFhM2EwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAg QEAKIDIwMTYtMTEtMzAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIEluZGV4ZWREQjogV2hlbiBkb2luZyBwdXRzLCBkb24ndCBkbyBkZWxldGVzIGlmIHRoZXJl IGFyZSBubyBpbmRleGVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY1MjE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTm8gbmV3IHRlc3RzIChObyBvYnNlcnZhYmxlIGJlaGF2aW9yIGNoYW5nZSkuCisK KyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3Jl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6U1FMaXRlSURCQmFja2luZ1N0b3Jl OjphZGRSZWNvcmQpOiBEb24ndCBkZWxldGVSYW5nZSBpZiB0aGVyZSBhcmUgbm8gaW5kZXhlcy4K KworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFiYXNlOjpwZXJm b3JtUHV0T3JBZGQpOiBEb24ndCAidXBkYXRlIGFsbCBpbmRleGVzIiBpZiB0aGVyZSBhcmUgbm9u ZS4KKworMjAxNi0xMS0zMCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKICAg ICAgICAgSW5kZXhlZERCIDIuMDogQ2FjaGUgYW5kIHJldXNlIFNRTGl0ZVN0YXRlbWVudHMgaW4g dGhlIFNRTGl0ZSBiYWNrZW5kLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTY0OTc0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHAKaW5k ZXggNjhmM2M3Ny4uZWM5ZWEzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHAK QEAgLTE2NjAsMTkgKzE2NjAsMjEgQEAgSURCRXJyb3IgU1FMaXRlSURCQmFja2luZ1N0b3JlOjph ZGRSZWNvcmQoY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cmFuc2FjdGkKICAgICAgICAg cmVjb3JkSUQgPSBtX3NxbGl0ZURCLT5sYXN0SW5zZXJ0Um93SUQoKTsKICAgICB9CiAKLSAgICBh dXRvIGVycm9yID0gdXBkYXRlQWxsSW5kZXhlc0ZvckFkZFJlY29yZChvYmplY3RTdG9yZUluZm8s IGtleURhdGEsIHZhbHVlLmRhdGEoKSk7CisgICAgaWYgKCFvYmplY3RTdG9yZUluZm8uaW5kZXhN YXAoKS5pc0VtcHR5KCkpIHsKKyAgICAgICAgYXV0byBlcnJvciA9IHVwZGF0ZUFsbEluZGV4ZXNG b3JBZGRSZWNvcmQob2JqZWN0U3RvcmVJbmZvLCBrZXlEYXRhLCB2YWx1ZS5kYXRhKCkpOwogCi0g ICAgaWYgKCFlcnJvci5pc051bGwoKSkgewotICAgICAgICBhdXRvKiBzcWwgPSBjYWNoZWRTdGF0 ZW1lbnQoU1FMOjpEZWxldGVPYmplY3RTdG9yZVJlY29yZCwgQVNDSUlMaXRlcmFsKCJERUxFVEUg RlJPTSBSZWNvcmRzIFdIRVJFIG9iamVjdFN0b3JlSUQgPSA/IEFORCBrZXkgPSBDQVNUKD8gQVMg VEVYVCk7IikpOwotICAgICAgICBpZiAoIXNxbAotICAgICAgICAgICAgfHwgc3FsLT5iaW5kSW50 NjQoMSwgb2JqZWN0U3RvcmVJbmZvLmlkZW50aWZpZXIoKSkgIT0gU1FMSVRFX09LCi0gICAgICAg ICAgICB8fCBzcWwtPmJpbmRCbG9iKDIsIGtleUJ1ZmZlci0+ZGF0YSgpLCBrZXlCdWZmZXItPnNp emUoKSkgIT0gU1FMSVRFX09LCi0gICAgICAgICAgICB8fCBzcWwtPnN0ZXAoKSAhPSBTUUxJVEVf RE9ORSkgewotICAgICAgICAgICAgTE9HX0VSUk9SKCJJbmRleGluZyBuZXcgb2JqZWN0IHN0b3Jl IHJlY29yZCBmYWlsZWQsIGJ1dCB1bmFibGUgdG8gcmVtb3ZlIHRoZSBvYmplY3Qgc3RvcmUgcmVj b3JkIGl0c2VsZiIpOwotICAgICAgICAgICAgcmV0dXJuIHsgSURCRGF0YWJhc2VFeGNlcHRpb246 OlVua25vd25FcnJvciwgQVNDSUlMaXRlcmFsKCJJbmRleGluZyBuZXcgb2JqZWN0IHN0b3JlIHJl Y29yZCBmYWlsZWQsIGJ1dCB1bmFibGUgdG8gcmVtb3ZlIHRoZSBvYmplY3Qgc3RvcmUgcmVjb3Jk IGl0c2VsZiIpIH07Ci0gICAgICAgIH0KKyAgICAgICAgaWYgKCFlcnJvci5pc051bGwoKSkgewor ICAgICAgICAgICAgYXV0byogc3FsID0gY2FjaGVkU3RhdGVtZW50KFNRTDo6RGVsZXRlT2JqZWN0 U3RvcmVSZWNvcmQsIEFTQ0lJTGl0ZXJhbCgiREVMRVRFIEZST00gUmVjb3JkcyBXSEVSRSBvYmpl Y3RTdG9yZUlEID0gPyBBTkQga2V5ID0gQ0FTVCg/IEFTIFRFWFQpOyIpKTsKKyAgICAgICAgICAg IGlmICghc3FsCisgICAgICAgICAgICAgICAgfHwgc3FsLT5iaW5kSW50NjQoMSwgb2JqZWN0U3Rv cmVJbmZvLmlkZW50aWZpZXIoKSkgIT0gU1FMSVRFX09LCisgICAgICAgICAgICAgICAgfHwgc3Fs LT5iaW5kQmxvYigyLCBrZXlCdWZmZXItPmRhdGEoKSwga2V5QnVmZmVyLT5zaXplKCkpICE9IFNR TElURV9PSworICAgICAgICAgICAgICAgIHx8IHNxbC0+c3RlcCgpICE9IFNRTElURV9ET05FKSB7 CisgICAgICAgICAgICAgICAgTE9HX0VSUk9SKCJJbmRleGluZyBuZXcgb2JqZWN0IHN0b3JlIHJl Y29yZCBmYWlsZWQsIGJ1dCB1bmFibGUgdG8gcmVtb3ZlIHRoZSBvYmplY3Qgc3RvcmUgcmVjb3Jk IGl0c2VsZiIpOworICAgICAgICAgICAgICAgIHJldHVybiB7IElEQkRhdGFiYXNlRXhjZXB0aW9u OjpVbmtub3duRXJyb3IsIEFTQ0lJTGl0ZXJhbCgiSW5kZXhpbmcgbmV3IG9iamVjdCBzdG9yZSBy ZWNvcmQgZmFpbGVkLCBidXQgdW5hYmxlIHRvIHJlbW92ZSB0aGUgb2JqZWN0IHN0b3JlIHJlY29y ZCBpdHNlbGYiKSB9OworICAgICAgICAgICAgfQogCi0gICAgICAgIHJldHVybiBlcnJvcjsKKyAg ICAgICAgICAgIHJldHVybiBlcnJvcjsKKyAgICAgICAgfQogICAgIH0KIAogICAgIGNvbnN0IFZl Y3RvcjxTdHJpbmc+JiBibG9iVVJMcyA9IHZhbHVlLmJsb2JVUkxzKCk7CkBAIC0xNzI4LDcgKzE3 MzAsNyBAQCBJREJFcnJvciBTUUxpdGVJREJCYWNraW5nU3RvcmU6OmFkZFJlY29yZChjb25zdCBJ REJSZXNvdXJjZUlkZW50aWZpZXImIHRyYW5zYWN0aQogCiAgICAgdHJhbnNhY3Rpb24tPm5vdGlm eUN1cnNvcnNPZkNoYW5nZXMob2JqZWN0U3RvcmVJbmZvLmlkZW50aWZpZXIoKSk7CiAKLSAgICBy ZXR1cm4gZXJyb3I7CisgICAgcmV0dXJuIHsgfTsKIH0KIAogSURCRXJyb3IgU1FMaXRlSURCQmFj a2luZ1N0b3JlOjpnZXRCbG9iUmVjb3Jkc0Zvck9iamVjdFN0b3JlUmVjb3JkKGludDY0X3Qgb2Jq ZWN0U3RvcmVSZWNvcmQsIFZlY3RvcjxTdHJpbmc+JiBibG9iVVJMcywgVmVjdG9yPFN0cmluZz4m IGJsb2JGaWxlUGF0aHMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4 ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcAppbmRleCBjYjA0ODYxYy4u NWQ1OTQyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2Vy dmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwCkBAIC0xMDA4LDEwICsxMDA4LDEy IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OnBlcmZvcm1QdXRPckFkZCh1aW50NjRfdCBjYWxs YmFja0lkZW50aWZpZXIsIGNvbnN0IElEQlJlCiAgICAgLy8gLi4uSWYgYSByZWNvcmQgYWxyZWFk eSBleGlzdHMgaW4gc3RvcmUgLi4uCiAgICAgLy8gdGhlbiByZW1vdmUgdGhlIHJlY29yZCBmcm9t IHN0b3JlIHVzaW5nIHRoZSBzdGVwcyBmb3IgZGVsZXRpbmcgcmVjb3JkcyBmcm9tIGFuIG9iamVj dCBzdG9yZS4uLgogICAgIC8vIFRoaXMgaXMgaW1wb3J0YW50IGJlY2F1c2UgZm9ybWFsbHkgZGVs ZXRpbmcgaXQgZnJvbSBmcm9tIHRoZSBvYmplY3Qgc3RvcmUgYWxzbyByZW1vdmVzIGl0IGZyb20g dGhlIGFwcHJvcHJpYXRlIGluZGV4ZXMuCi0gICAgZXJyb3IgPSBtX2JhY2tpbmdTdG9yZS0+ZGVs ZXRlUmFuZ2UodHJhbnNhY3Rpb25JZGVudGlmaWVyLCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIHVz ZWRLZXkpOwotICAgIGlmICghZXJyb3IuaXNOdWxsKCkpIHsKLSAgICAgICAgcG9zdERhdGFiYXNl VGFza1JlcGx5KGNyZWF0ZUNyb3NzVGhyZWFkVGFzaygqdGhpcywgJlVuaXF1ZUlEQkRhdGFiYXNl OjpkaWRQZXJmb3JtUHV0T3JBZGQsIGNhbGxiYWNrSWRlbnRpZmllciwgZXJyb3IsIHVzZWRLZXkp KTsKLSAgICAgICAgcmV0dXJuOworICAgIGlmICghb2JqZWN0U3RvcmVJbmZvLT5pbmRleE1hcCgp LmlzRW1wdHkoKSkgeworICAgICAgICBlcnJvciA9IG1fYmFja2luZ1N0b3JlLT5kZWxldGVSYW5n ZSh0cmFuc2FjdGlvbklkZW50aWZpZXIsIG9iamVjdFN0b3JlSWRlbnRpZmllciwgdXNlZEtleSk7 CisgICAgICAgIGlmICghZXJyb3IuaXNOdWxsKCkpIHsKKyAgICAgICAgICAgIHBvc3REYXRhYmFz ZVRhc2tSZXBseShjcmVhdGVDcm9zc1RocmVhZFRhc2soKnRoaXMsICZVbmlxdWVJREJEYXRhYmFz ZTo6ZGlkUGVyZm9ybVB1dE9yQWRkLCBjYWxsYmFja0lkZW50aWZpZXIsIGVycm9yLCB1c2VkS2V5 KSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAoaW5q ZWN0ZWRSZWNvcmRWYWx1ZS5kYXRhKCkpCg== 295749 2016-11-30 13:25:31 -0800 2016-11-30 18:42:49 -0800 PFL patch text/plain 3627 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5MDA1NDRlLi5iN2Y0ZDA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTgg QEAKIDIwMTYtMTEtMzAgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIEluZGV4ZWREQjogV2hlbiBkb2luZyBwdXRzLCBkb24ndCAidXBkYXRlQWxsSW5kZXhlc0Zv ckFkZFJlY29yZCIgaWYgdGhlcmUgYXJlIG5vIGluZGV4ZXMuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjUyMTUKKworICAgICAgICBSZXZpZXdlZCBi eSBBbGV4IENocmlzdGVuc2VuLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoTm8gb2JzZXJ2YWJs ZSBiZWhhdmlvciBjaGFuZ2UpLgorCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvc2VydmVy L1NRTGl0ZUlEQkJhY2tpbmdTdG9yZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6 OlNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6YWRkUmVjb3JkKTogRG9uJ3QgInVwZGF0ZUFsbEluZGV4 ZXNGb3JBZGRSZWNvcmQiIGlmIHRoZXJlIGFyZSBubyBpbmRleGVzLgorICAgICAgICAgIEF2b2lk aW5nIHRoaXMgc2F2ZWQgdXMgc29tZSBJREJLZXkgc2VyaWFsaXphdGlvbiBhbmQgSmF2YXNjcmlw dCBvYmplY3QgbWFuaXB1bGF0aW9uLgorCisyMDE2LTExLTMwICBCcmFkeSBFaWRzb24gIDxiZWlk c29uQGFwcGxlLmNvbT4KKwogICAgICAgICBJbmRleGVkREIgMi4wOiBDYWNoZSBhbmQgcmV1c2Ug U1FMaXRlU3RhdGVtZW50cyBpbiB0aGUgU1FMaXRlIGJhY2tlbmQuCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjQ5NzQKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1NRTGl0ZUlEQkJhY2tpbmdTdG9y ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURC QmFja2luZ1N0b3JlLmNwcAppbmRleCA2OGYzYzc3Li5lYzllYTM2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRlSURCQmFja2luZ1N0b3Jl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvU1FMaXRl SURCQmFja2luZ1N0b3JlLmNwcApAQCAtMTY2MCwxOSArMTY2MCwyMSBAQCBJREJFcnJvciBTUUxp dGVJREJCYWNraW5nU3RvcmU6OmFkZFJlY29yZChjb25zdCBJREJSZXNvdXJjZUlkZW50aWZpZXIm IHRyYW5zYWN0aQogICAgICAgICByZWNvcmRJRCA9IG1fc3FsaXRlREItPmxhc3RJbnNlcnRSb3dJ RCgpOwogICAgIH0KIAotICAgIGF1dG8gZXJyb3IgPSB1cGRhdGVBbGxJbmRleGVzRm9yQWRkUmVj b3JkKG9iamVjdFN0b3JlSW5mbywga2V5RGF0YSwgdmFsdWUuZGF0YSgpKTsKKyAgICBpZiAoIW9i amVjdFN0b3JlSW5mby5pbmRleE1hcCgpLmlzRW1wdHkoKSkgeworICAgICAgICBhdXRvIGVycm9y ID0gdXBkYXRlQWxsSW5kZXhlc0ZvckFkZFJlY29yZChvYmplY3RTdG9yZUluZm8sIGtleURhdGEs IHZhbHVlLmRhdGEoKSk7CiAKLSAgICBpZiAoIWVycm9yLmlzTnVsbCgpKSB7Ci0gICAgICAgIGF1 dG8qIHNxbCA9IGNhY2hlZFN0YXRlbWVudChTUUw6OkRlbGV0ZU9iamVjdFN0b3JlUmVjb3JkLCBB U0NJSUxpdGVyYWwoIkRFTEVURSBGUk9NIFJlY29yZHMgV0hFUkUgb2JqZWN0U3RvcmVJRCA9ID8g QU5EIGtleSA9IENBU1QoPyBBUyBURVhUKTsiKSk7Ci0gICAgICAgIGlmICghc3FsCi0gICAgICAg ICAgICB8fCBzcWwtPmJpbmRJbnQ2NCgxLCBvYmplY3RTdG9yZUluZm8uaWRlbnRpZmllcigpKSAh PSBTUUxJVEVfT0sKLSAgICAgICAgICAgIHx8IHNxbC0+YmluZEJsb2IoMiwga2V5QnVmZmVyLT5k YXRhKCksIGtleUJ1ZmZlci0+c2l6ZSgpKSAhPSBTUUxJVEVfT0sKLSAgICAgICAgICAgIHx8IHNx bC0+c3RlcCgpICE9IFNRTElURV9ET05FKSB7Ci0gICAgICAgICAgICBMT0dfRVJST1IoIkluZGV4 aW5nIG5ldyBvYmplY3Qgc3RvcmUgcmVjb3JkIGZhaWxlZCwgYnV0IHVuYWJsZSB0byByZW1vdmUg dGhlIG9iamVjdCBzdG9yZSByZWNvcmQgaXRzZWxmIik7Ci0gICAgICAgICAgICByZXR1cm4geyBJ REJEYXRhYmFzZUV4Y2VwdGlvbjo6VW5rbm93bkVycm9yLCBBU0NJSUxpdGVyYWwoIkluZGV4aW5n IG5ldyBvYmplY3Qgc3RvcmUgcmVjb3JkIGZhaWxlZCwgYnV0IHVuYWJsZSB0byByZW1vdmUgdGhl IG9iamVjdCBzdG9yZSByZWNvcmQgaXRzZWxmIikgfTsKLSAgICAgICAgfQorICAgICAgICBpZiAo IWVycm9yLmlzTnVsbCgpKSB7CisgICAgICAgICAgICBhdXRvKiBzcWwgPSBjYWNoZWRTdGF0ZW1l bnQoU1FMOjpEZWxldGVPYmplY3RTdG9yZVJlY29yZCwgQVNDSUlMaXRlcmFsKCJERUxFVEUgRlJP TSBSZWNvcmRzIFdIRVJFIG9iamVjdFN0b3JlSUQgPSA/IEFORCBrZXkgPSBDQVNUKD8gQVMgVEVY VCk7IikpOworICAgICAgICAgICAgaWYgKCFzcWwKKyAgICAgICAgICAgICAgICB8fCBzcWwtPmJp bmRJbnQ2NCgxLCBvYmplY3RTdG9yZUluZm8uaWRlbnRpZmllcigpKSAhPSBTUUxJVEVfT0sKKyAg ICAgICAgICAgICAgICB8fCBzcWwtPmJpbmRCbG9iKDIsIGtleUJ1ZmZlci0+ZGF0YSgpLCBrZXlC dWZmZXItPnNpemUoKSkgIT0gU1FMSVRFX09LCisgICAgICAgICAgICAgICAgfHwgc3FsLT5zdGVw KCkgIT0gU1FMSVRFX0RPTkUpIHsKKyAgICAgICAgICAgICAgICBMT0dfRVJST1IoIkluZGV4aW5n IG5ldyBvYmplY3Qgc3RvcmUgcmVjb3JkIGZhaWxlZCwgYnV0IHVuYWJsZSB0byByZW1vdmUgdGhl IG9iamVjdCBzdG9yZSByZWNvcmQgaXRzZWxmIik7CisgICAgICAgICAgICAgICAgcmV0dXJuIHsg SURCRGF0YWJhc2VFeGNlcHRpb246OlVua25vd25FcnJvciwgQVNDSUlMaXRlcmFsKCJJbmRleGlu ZyBuZXcgb2JqZWN0IHN0b3JlIHJlY29yZCBmYWlsZWQsIGJ1dCB1bmFibGUgdG8gcmVtb3ZlIHRo ZSBvYmplY3Qgc3RvcmUgcmVjb3JkIGl0c2VsZiIpIH07CisgICAgICAgICAgICB9CiAKLSAgICAg ICAgcmV0dXJuIGVycm9yOworICAgICAgICAgICAgcmV0dXJuIGVycm9yOworICAgICAgICB9CiAg ICAgfQogCiAgICAgY29uc3QgVmVjdG9yPFN0cmluZz4mIGJsb2JVUkxzID0gdmFsdWUuYmxvYlVS THMoKTsKQEAgLTE3MjgsNyArMTczMCw3IEBAIElEQkVycm9yIFNRTGl0ZUlEQkJhY2tpbmdTdG9y ZTo6YWRkUmVjb3JkKGNvbnN0IElEQlJlc291cmNlSWRlbnRpZmllciYgdHJhbnNhY3RpCiAKICAg ICB0cmFuc2FjdGlvbi0+bm90aWZ5Q3Vyc29yc09mQ2hhbmdlcyhvYmplY3RTdG9yZUluZm8uaWRl bnRpZmllcigpKTsKIAotICAgIHJldHVybiBlcnJvcjsKKyAgICByZXR1cm4geyB9OwogfQogCiBJ REJFcnJvciBTUUxpdGVJREJCYWNraW5nU3RvcmU6OmdldEJsb2JSZWNvcmRzRm9yT2JqZWN0U3Rv cmVSZWNvcmQoaW50NjRfdCBvYmplY3RTdG9yZVJlY29yZCwgVmVjdG9yPFN0cmluZz4mIGJsb2JV UkxzLCBWZWN0b3I8U3RyaW5nPiYgYmxvYkZpbGVQYXRocykK