167281 2017-01-21 01:50:33 -0800 Database file not removed for origins after deleting all databases 2017-01-22 23:30:19 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 146589 1 cgarcia webkit-unassigned achristensen andersca beidson darin oldest_to_newest 1268739 0 cgarcia 2017-01-21 01:50:33 -0800 I noticed this writing unit tests for new WebsiteData API in the GTK+ port. When DatabaseTracker::deleteDatabasesModifiedSince() is called with a min time, all databases for every origin are deleted. For each origin if all databases are removed DatabaseTracker::deleteOrigin() is called to remove also the origin database file. However, DatabaseTracker::deleteOrigin() returns early if the origin doesn't have databases and in this particular case it never has databases, because we have just removed them. 1268740 1 299428 cgarcia 2017-01-21 01:55:20 -0800 Created attachment 299428 Patch 1269010 2 cgarcia 2017-01-22 23:30:19 -0800 Committed r211035: <http://trac.webkit.org/changeset/211035> 299428 2017-01-21 01:55:20 -0800 2017-01-21 13:54:14 -0800 Patch wcore-delete-databases.diff text/plain 3438 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0Y2FjODAxMWYxZS4uZTVlZGM3NjkxZTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyNSBAQAogMjAxNy0wMS0yMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgRGF0YWJhc2UgZmlsZSBub3QgcmVtb3ZlZCBmb3Igb3JpZ2lu cyBhZnRlciBkZWxldGluZyBhbGwgZGF0YWJhc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjcyODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIERhdGFiYXNlVHJhY2tlcjo6ZGVsZXRlRGF0YWJh c2VzTW9kaWZpZWRTaW5jZSgpIGlzIGNhbGxlZCB3aXRoIGEgbWluIHRpbWUsIGFsbCBkYXRhYmFz ZXMgZm9yIGV2ZXJ5IG9yaWdpbgorICAgICAgICBhcmUgZGVsZXRlZC4gRm9yIGVhY2ggb3JpZ2lu IGlmIGFsbCBkYXRhYmFzZXMgYXJlIHJlbW92ZWQgRGF0YWJhc2VUcmFja2VyOjpkZWxldGVPcmln aW4oKSBpcyBjYWxsZWQgdG8gcmVtb3ZlCisgICAgICAgIGFsc28gdGhlIG9yaWdpbiBkYXRhYmFz ZSBmaWxlLiBIb3dldmVyLCBEYXRhYmFzZVRyYWNrZXI6OmRlbGV0ZU9yaWdpbigpIHJldHVybnMg ZWFybHkgaWYgdGhlIG9yaWdpbiBkb2Vzbid0IGhhdmUKKyAgICAgICAgZGF0YWJhc2VzIGFuZCBp biB0aGlzIHBhcnRpY3VsYXIgY2FzZSBpdCBuZXZlciBoYXMgZGF0YWJhc2VzLCBiZWNhdXNlIHdl IGhhdmUganVzdCByZW1vdmVkIHRoZW0uCisKKyAgICAgICAgVGhpcyB3aWxsIGJlIGNvdmVyZWQg YnkgR1RLKyB1bml0IHRlc3RzLgorCisgICAgICAgICogTW9kdWxlcy93ZWJkYXRhYmFzZS9EYXRh YmFzZVRyYWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VUcmFja2VyOjpkZWxl dGVEYXRhYmFzZXNNb2RpZmllZFNpbmNlKTogSW5zdGVhZCBvZiByZW1vdmluZyB0aGUgZGF0YWJh c2VzIHdoaWxlIGl0ZXJhdGluZworICAgICAgICB0aGVtLCBhZGQgdGhlIG9uZXMgdG8gYmUgcmVt b3ZlZCB0byBhIHZlY3Rvci4gSWYgYWZ0ZXIgdGhlIGl0ZXJhdGlvbiBhbGwgZGF0YWJhc2VzIHNo b3VsZCBiZSByZW1vdmVkIGNhbGwKKyAgICAgICAgRGF0YWJhc2VUcmFja2VyOjpkZWxldGVPcmln aW4oKSB0byBlbnN1cmUgYm90aCB0aGUgZGF0YWJhc2VzIGFuZCB0aGUgZGF0YWJhc2UgZmlsZSBh cmUgcmVtb3ZlZCBmb3IgdGhlIG9yaWdpbiwKKyAgICAgICAgb3RoZXJ3aGlzZSBjYWxsIERhdGFi YXNlVHJhY2tlcjo6ZGVsZXRlRGF0YWJhc2UoKSBmb3IgZXZlcnkgZGF0YWJhc2UgdG8gZGVsZXRl LgorCisyMDE3LTAxLTIxICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNv bT4KKwogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjExMDEyLgogCiAgICAgICAg IEl0IGNhdXNlZCBhIGxvdCBvZiBjcmFzaGVzIGluIHRoZSBuZXR3b3JrIHByb2Nlc3MKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VUcmFja2Vy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VUcmFja2Vy LmNwcAppbmRleCBlZmRlNjZjNjYwOC4uNDM3MDk3NzE3YTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvd2ViZGF0YWJhc2UvRGF0YWJhc2VUcmFja2VyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmRhdGFiYXNlL0RhdGFiYXNlVHJhY2tlci5jcHAKQEAgLTc3 NiwyNSArNzc2LDI4IEBAIHZvaWQgRGF0YWJhc2VUcmFja2VyOjpkZWxldGVBbGxEYXRhYmFzZXNJ bW1lZGlhdGVseSgpCiB2b2lkIERhdGFiYXNlVHJhY2tlcjo6ZGVsZXRlRGF0YWJhc2VzTW9kaWZp ZWRTaW5jZShzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjp0aW1lX3BvaW50IHRpbWUpCiB7CiAg ICAgZm9yIChhdXRvJiBvcmlnaW4gOiBvcmlnaW5zKCkpIHsKLSAgICAgICAgYm9vbCBkZWxldGVk QWxsID0gdHJ1ZTsKLSAgICAgICAgZm9yIChhdXRvJiBkYXRhYmFzZU5hbWUgOiBkYXRhYmFzZU5h bWVzKG9yaWdpbikpIHsKKyAgICAgICAgVmVjdG9yPFN0cmluZz4gZGF0YWJhc2VOYW1lcyA9IHRo aXMtPmRhdGFiYXNlTmFtZXMob3JpZ2luKTsKKyAgICAgICAgVmVjdG9yPFN0cmluZz4gZGF0YWJh c2VOYW1lc1RvRGVsZXRlOworICAgICAgICBkYXRhYmFzZU5hbWVzVG9EZWxldGUucmVzZXJ2ZUlu aXRpYWxDYXBhY2l0eShkYXRhYmFzZU5hbWVzLnNpemUoKSk7CisgICAgICAgIGZvciAoY29uc3Qg YXV0byYgZGF0YWJhc2VOYW1lIDogZGF0YWJhc2VOYW1lcykgewogICAgICAgICAgICAgYXV0byBm dWxsUGF0aCA9IGZ1bGxQYXRoRm9yRGF0YWJhc2Uob3JpZ2luLCBkYXRhYmFzZU5hbWUsIGZhbHNl KTsKIAogICAgICAgICAgICAgdGltZV90IG1vZGlmaWNhdGlvblRpbWU7Ci0gICAgICAgICAgICBp ZiAoIWdldEZpbGVNb2RpZmljYXRpb25UaW1lKGZ1bGxQYXRoLCBtb2RpZmljYXRpb25UaW1lKSkg ewotICAgICAgICAgICAgICAgIGRlbGV0ZWRBbGwgPSBmYWxzZTsKKyAgICAgICAgICAgIGlmICgh Z2V0RmlsZU1vZGlmaWNhdGlvblRpbWUoZnVsbFBhdGgsIG1vZGlmaWNhdGlvblRpbWUpKQogICAg ICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBpZiAo bW9kaWZpY2F0aW9uVGltZSA8IHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRvX3RpbWVfdCh0 aW1lKSkgewotICAgICAgICAgICAgICAgIGRlbGV0ZWRBbGwgPSBmYWxzZTsKKyAgICAgICAgICAg IGlmIChtb2RpZmljYXRpb25UaW1lIDwgc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6dG9fdGlt ZV90KHRpbWUpKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgfQogCi0g ICAgICAgICAgICBkZWxldGVEYXRhYmFzZShvcmlnaW4sIGRhdGFiYXNlTmFtZSk7CisgICAgICAg ICAgICBkYXRhYmFzZU5hbWVzVG9EZWxldGUudW5jaGVja2VkQXBwZW5kKGRhdGFiYXNlTmFtZSk7 CiAgICAgICAgIH0KLSAgICAgICAgaWYgKGRlbGV0ZWRBbGwpCisKKyAgICAgICAgaWYgKGRhdGFi YXNlTmFtZXMuc2l6ZSgpID09IGRhdGFiYXNlTmFtZXNUb0RlbGV0ZS5zaXplKCkpCiAgICAgICAg ICAgICBkZWxldGVPcmlnaW4ob3JpZ2luKTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICBm b3IgKGNvbnN0IGF1dG8mIGRhdGFiYXNlTmFtZSA6IGRhdGFiYXNlTmFtZXNUb0RlbGV0ZSkKKyAg ICAgICAgICAgICAgICBkZWxldGVEYXRhYmFzZShvcmlnaW4sIGRhdGFiYXNlTmFtZSk7CisgICAg ICAgIH0KICAgICB9CiB9CiAK