154735 2016-02-26 10:45:00 -0800 Modern IDB: Using existing database info from SQLite backing store is busted 2016-02-26 11:49:34 -0800 1 1 1 Unclassified WebKit WebCore Misc. Safari 9 Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 149117 1 beidson beidson achristensen alecflett commit-queue jsbell oldest_to_newest 1168568 0 beidson 2016-02-26 10:45:00 -0800 Modern IDB: Using existing database info from SQLite backing store is busted Extracting the database info on the backing store thread works fine. When we do a thread-safe copy back to the main thread, object store infos weren't copied. Yikes. 1168569 1 beidson 2016-02-26 10:45:25 -0800 <rdar://problem/24848143> 1168571 2 beidson 2016-02-26 10:47:48 -0800 Also there was an obvious code path where we don't migrate index records from existing databases. *sigh* 1168576 3 272340 beidson 2016-02-26 10:51:09 -0800 Created attachment 272340 Patch v1 1168609 4 272340 commit-queue 2016-02-26 11:49:29 -0800 Comment on attachment 272340 Patch v1 Clearing flags on attachment: 272340 Committed r197190: <http://trac.webkit.org/changeset/197190> 1168611 5 commit-queue 2016-02-26 11:49:34 -0800 All reviewed patches have been landed. Closing bug. 272340 2016-02-26 10:51:09 -0800 2016-02-26 11:49:29 -0800 Patch v1 patch text/plain 4582 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiMjQwNjI0Li5hMjFiZDhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTYtMDItMjYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIE1vZGVybiBJREI6IFVzaW5nIGV4aXN0aW5nIGRhdGFiYXNlIGluZm8gZnJvbSBTUUxpdGUg YmFja2luZyBzdG9yZSBpcyBidXN0ZWQuCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNDg0ODE0 Mz4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQ3MzUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVz dHMuCisgICAgICAgIAorICAgICAgICBSZXByb2R1Y2luZyB0aGUgYnVnIHJlcXVpcmVzIGhhdmlu ZyBhIGtub3duIGRhdGFiYXNlIG9uIGRpc2sgKmJlZm9yZSogbGF1bmNoaW5nIHRoZSBEYXRhYmFz ZVByb2Nlc3MgdG8KKyAgICAgICAgcmVhZCBpbiB0aGUgZXhpc3RpbmcgSURCRGF0YWJhc2VJbmZv LgorICAgICAgICAKKyAgICAgICAgT3VyIGF1dG9tYXRlZCBpbmZyYXN0cnVjdHVyZSBjdXJyZW50 bHkgaGFzIG5vIHdheSBvZiB0ZXN0aW5nIHRoaXMuCisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4 ZWRkYi9jbGllbnQvSURCQ29ubmVjdGlvblRvU2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OklEQkNsaWVudDo6SURCQ29ubmVjdGlvblRvU2VydmVyOjpvcGVuRGF0YWJhc2UpOgorICAgICAg ICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpTUUxpdGVJREJCYWNraW5nU3RvcmU6OmdldE9y RXN0YWJsaXNoRGF0YWJhc2VJbmZvKTogRG8gdGhlIG9wdGlvbmFsIG1pZ3JhdGUgb24KKyAgICAg ICAgICB0aGUgSW5kZXhSZWNvcmRzIHRhYmxlIGhlcmU7ICpldmVyeSogdGltZSB3ZSBvcGVuIGEg U1FMaXRlIGJhY2tpbmcgc3RvcmUuCisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlNRTGl0 ZUlEQkJhY2tpbmdTdG9yZTo6Y3JlYXRlQW5kUG9wdWxhdGVJbml0aWFsRGF0YWJhc2VJbmZvKTog RGVsZXRlZC4KKyAgICAgICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9zaGFyZWQvSURCRGF0YWJhc2VJ bmZvLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklEQkRhdGFiYXNlSW5mbzo6aXNvbGF0ZWRDb3B5 KTogQ29weSB0aGUgZW50aXJlIG9iamVjdCwgbm90IGp1c3QgbmFtZS92ZXJzaW9uLgorCiAyMDE2 LTAyLTI1ICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KIAogICAg ICAgICBTaG91bGQgdGVtcGxhdGUgUmVmQ291bnRlciBpbnN0ZWFkIG9mIFJlZkNvdW50ZXI6OlRv a2VuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQv SURCQ29ubmVjdGlvblRvU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL2NsaWVudC9JREJDb25uZWN0aW9uVG9TZXJ2ZXIuY3BwCmluZGV4IGIyMGI5YzYuLmRkNTg1 OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9J REJDb25uZWN0aW9uVG9TZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL2NsaWVudC9JREJDb25uZWN0aW9uVG9TZXJ2ZXIuY3BwCkBAIC03Niw3ICs3Niw3IEBA IHZvaWQgSURCQ29ubmVjdGlvblRvU2VydmVyOjpkaWREZWxldGVEYXRhYmFzZShjb25zdCBJREJS ZXN1bHREYXRhJiByZXN1bHREYXRhKQogCiB2b2lkIElEQkNvbm5lY3Rpb25Ub1NlcnZlcjo6b3Bl bkRhdGFiYXNlKElEQk9wZW5EQlJlcXVlc3QmIHJlcXVlc3QpCiB7Ci0gICAgTE9HKEluZGV4ZWRE QiwgIklEQkNvbm5lY3Rpb25Ub1NlcnZlcjo6b3BlbkRhdGFiYXNlIC0gJXMiLCByZXF1ZXN0LmRh dGFiYXNlSWRlbnRpZmllcigpLmRlYnVnU3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CisgICAgTE9H KEluZGV4ZWREQiwgIklEQkNvbm5lY3Rpb25Ub1NlcnZlcjo6b3BlbkRhdGFiYXNlIC0gJXMgKCUi IFBSSXU2NCAiKSIsIHJlcXVlc3QuZGF0YWJhc2VJZGVudGlmaWVyKCkuZGVidWdTdHJpbmcoKS51 dGY4KCkuZGF0YSgpLCByZXF1ZXN0LnZlcnNpb24oKSk7CiAKICAgICBBU1NFUlQoIW1fb3BlbkRC UmVxdWVzdE1hcC5jb250YWlucyhyZXF1ZXN0LnJlc291cmNlSWRlbnRpZmllcigpKSk7CiAgICAg bV9vcGVuREJSZXF1ZXN0TWFwLnNldChyZXF1ZXN0LnJlc291cmNlSWRlbnRpZmllcigpLCAmcmVx dWVzdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2 ZXIvU1FMaXRlSURCQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCmluZGV4IGI1ZDUyNTYuLmMx ZTgxNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZl ci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv aW5kZXhlZGRiL3NlcnZlci9TUUxpdGVJREJCYWNraW5nU3RvcmUuY3BwCkBAIC0zNzIsMTIgKzM3 Miw2IEBAIHN0ZDo6dW5pcXVlX3B0cjxJREJEYXRhYmFzZUluZm8+IFNRTGl0ZUlEQkJhY2tpbmdT dG9yZTo6Y3JlYXRlQW5kUG9wdWxhdGVJbml0aWFsCiAgICAgICAgIHJldHVybiBudWxscHRyOwog ICAgIH0KIAotICAgIGlmICghZW5zdXJlVmFsaWRJbmRleFJlY29yZHNUYWJsZSgpKSB7Ci0gICAg ICAgIExPR19FUlJPUigiQ291bGQgbm90IGNyZWF0ZSBJbmRleFJlY29yZHMgdGFibGUgaW4gZGF0 YWJhc2UgKCVpKSAtICVzIiwgbV9zcWxpdGVEQi0+bGFzdEVycm9yKCksIG1fc3FsaXRlREItPmxh c3RFcnJvck1zZygpKTsKLSAgICAgICAgbV9zcWxpdGVEQiA9IG51bGxwdHI7Ci0gICAgICAgIHJl dHVybiBudWxscHRyOwotICAgIH0KLQogICAgIGlmICghbV9zcWxpdGVEQi0+ZXhlY3V0ZUNvbW1h bmQoIkNSRUFURSBUQUJMRSBLZXlHZW5lcmF0b3JzIChvYmplY3RTdG9yZUlEIElOVEVHRVIgTk9U IE5VTEwgT04gQ09ORkxJQ1QgRkFJTCBVTklRVUUgT04gQ09ORkxJQ1QgUkVQTEFDRSwgY3VycmVu dEtleSBJTlRFR0VSIE5PVCBOVUxMIE9OIENPTkZMSUNUIEZBSUwpOyIpKSB7CiAgICAgICAgIExP R19FUlJPUigiQ291bGQgbm90IGNyZWF0ZSBLZXlHZW5lcmF0b3JzIHRhYmxlIGluIGRhdGFiYXNl ICglaSkgLSAlcyIsIG1fc3FsaXRlREItPmxhc3RFcnJvcigpLCBtX3NxbGl0ZURCLT5sYXN0RXJy b3JNc2coKSk7CiAgICAgICAgIG1fc3FsaXRlREIgPSBudWxscHRyOwpAQCAtNTk0LDYgKzU4OCwx MiBAQCBjb25zdCBJREJEYXRhYmFzZUluZm8mIFNRTGl0ZUlEQkJhY2tpbmdTdG9yZTo6Z2V0T3JF c3RhYmxpc2hEYXRhYmFzZUluZm8oKQogICAgICAgICByZXR1cm4gKm1fZGF0YWJhc2VJbmZvOwog ICAgIH0KIAorICAgIGlmICghZW5zdXJlVmFsaWRJbmRleFJlY29yZHNUYWJsZSgpKSB7CisgICAg ICAgIExPR19FUlJPUigiRXJyb3IgY3JlYXRpbmcgb3IgbWlncmF0aW5nIEluZGV4IFJlY29yZHMg dGFibGUgaW4gZGF0YWJhc2UiKTsKKyAgICAgICAgbV9zcWxpdGVEQiA9IG51bGxwdHI7CisgICAg ICAgIHJldHVybiAqbV9kYXRhYmFzZUluZm87CisgICAgfQorCiAgICAgYXV0byBkYXRhYmFzZUlu Zm8gPSBleHRyYWN0RXhpc3RpbmdEYXRhYmFzZUluZm8oKTsKICAgICBpZiAoIWRhdGFiYXNlSW5m bykKICAgICAgICAgZGF0YWJhc2VJbmZvID0gY3JlYXRlQW5kUG9wdWxhdGVJbml0aWFsRGF0YWJh c2VJbmZvKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9z aGFyZWQvSURCRGF0YWJhc2VJbmZvLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL3NoYXJlZC9JREJEYXRhYmFzZUluZm8uY3BwCmluZGV4IDlkZTVmNDIuLjdjZGI5MWUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NoYXJlZC9JREJEYXRh YmFzZUluZm8uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NoYXJl ZC9JREJEYXRhYmFzZUluZm8uY3BwCkBAIC00Niw2ICs0NiwxMCBAQCBJREJEYXRhYmFzZUluZm8g SURCRGF0YWJhc2VJbmZvOjppc29sYXRlZENvcHkoKSBjb25zdAogCiAgICAgaW5mby5tX25hbWUg PSBtX25hbWUuaXNvbGF0ZWRDb3B5KCk7CiAgICAgaW5mby5tX3ZlcnNpb24gPSBtX3ZlcnNpb247 CisgICAgaW5mby5tX21heE9iamVjdFN0b3JlSUQgPSBtX21heE9iamVjdFN0b3JlSUQ7CisKKyAg ICBmb3IgKGF1dG8gZW50cnkgOiBtX29iamVjdFN0b3JlTWFwKQorICAgICAgICBpbmZvLm1fb2Jq ZWN0U3RvcmVNYXAuc2V0KGVudHJ5LmtleSwgZW50cnkudmFsdWUuaXNvbGF0ZWRDb3B5KCkpOwog CiAgICAgcmV0dXJuIGluZm87CiB9Cg==