Closed Bug 1609176 Opened 2 years ago Closed 2 years ago

Stop using the obsolete baseDomain field of moz_cookies

Categories

(Core :: Networking: Cookies, enhancement)

enhancement
Not set
normal

Tracking

()

RESOLVED FIXED
mozilla74
Tracking Status
firefox74 --- fixed

People

(Reporter: ehsan.akhgari, Assigned: ehsan.akhgari)

Details

Attachments

(1 file)

See bug 1601499 comment 9. We should remove the code that tries to access this database field, and also remove the database index.

Given that we don't really support downgrading profiles any longer, we may even be able to drop the field altogether. Note that doing so will make it impossible to downgrade newer cookies.sqlite files using older Firefox builds.

baku, what do you think?

Flags: needinfo?(amarchesini)

It makes sense to me. Do you have time to do it?

Flags: needinfo?(amarchesini)

Sure.

This change is backwards incompatible with the older cookies.sqlite
files, which means files saved from newer versions of Firefox will
no longer be possible to open in older versions of Firefox.

Assignee: nobody → ehsan
Status: NEW → ASSIGNED
Pushed by eakhgari@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/4cf57a5a3143
Remove the obsolete baseDomain field of the moz_cookies table; r=baku

Backed out changeset 4cf57a5a3143 (Bug 1609176) for test_cookies_async_failure.js related failures

Push with failures: https://treeherder.mozilla.org/#/jobs?repo=autoland&searchStr=android%2C7.0%2Cx86-64%2Copt%2Cxpcshell%2Ctests%2Ctest-android-em-7.0-x86_64%2Fopt-geckoview-xpcshell-e10s&fromchange=6906316c6dd38ac67834fe5ea44975c71d10184e&tochange=a28ff4793d6eec52398b86442c9104ba14741842&selectedJob=286004820

Backout link: https://hg.mozilla.org/integration/autoland/rev/a28ff4793d6eec52398b86442c9104ba14741842

Failure log: https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=286004820&repo=autoland&lineNumber=1983

task 2020-01-22T19:33:11.289Z] 19:33:11 INFO - TEST-START | netwerk/test/unit/test_cookies_async_failure.js
[task 2020-01-22T19:33:12.521Z] 19:33:12 WARNING - TEST-UNEXPECTED-FAIL | netwerk/test/unit/test_cookies_async_failure.js | xpcshell return code: 0
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - TEST-INFO took 1217ms
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - >>>>>>>
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - netwerk/test/unit/test_cookies_async_failure.js | xpcw: cd /sdcard/tests/xpc/netwerk/test/unit
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - netwerk/test/unit/test_cookies_async_failure.js | xpcw: xpcshell -r /sdcard/tests/xpc/c/httpd.manifest --greomni /data/local/xpcb/geckoview-androidTest.apk -m -s -e const _HEAD_JS_PATH = "/sdcard/tests/xpc/head.js"; -e const _MOZINFO_JS_PATH = "/sdcard/tests/xpc/p/mozinfo.json"; -e const _PREFS_FILE = "/sdcard/tests/xpc/user.js"; -e const _TESTING_MODULES_DIR = "/sdcard/tests/xpc/m"; -f /sdcard/tests/xpc/head.js -e const _HEAD_FILES = ["/sdcard/tests/xpc/netwerk/test/unit/head_channels.js", "/sdcard/tests/xpc/netwerk/test/unit/head_cache.js", "/sdcard/tests/xpc/netwerk/test/unit/head_cache2.js", "/sdcard/tests/xpc/netwerk/test/unit/head_cookies.js"]; -e const _JSDEBUGGER_PORT = 0; -e const _TEST_FILE = ["test_cookies_async_failure.js"]; -e const _TEST_NAME = "netwerk/test/unit/test_cookies_async_failure.js"; -e _execute_test(); quit(0);
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - (xpcshell/head.js) | test MAIN run_test pending (1)
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - (xpcshell/head.js) | test pending (2)
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | do_run_test - [do_run_test : 43] true == true
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | do_run_test - [do_run_test : 44] true == true
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - (xpcshell/head.js) | test MAIN run_test finished (2)
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - running event loop
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | undefined assertion name - "cookie-db-closed" == "cookie-db-closed"
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 140] 1 == 1
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | undefined assertion name - "cookie-db-read" == "cookie-db-read"
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 165] 1 == 1
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 179] 1 == 1
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - (xpcshell/head.js) | test pending (2)
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 179] 1 == 1
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - (xpcshell/head.js) | test pending (3)
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - (xpcshell/head.js) | test finished (3)
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 179] 1 == 1
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - (xpcshell/head.js) | test pending (3)
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - (xpcshell/head.js) | test finished (3)
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 179] 1 == 1
[task 2020-01-22T19:33:12.521Z] 19:33:12 INFO - (xpcshell/head.js) | test pending (3)
[task 2020-01-22T19:33:12.522Z] 19:33:12 INFO - (xpcshell/head.js) | test finished (3)
[task 2020-01-22T19:33:12.522Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 179] 1 == 1
[task 2020-01-22T19:33:12.522Z] 19:33:12 INFO - (xpcshell/head.js) | test pending (3)
[task 2020-01-22T19:33:12.522Z] 19:33:12 INFO - (xpcshell/head.js) | test finished (3)
[task 2020-01-22T19:33:12.522Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 179] 1 == 1
[task 2020-01-22T19:33:12.522Z] 19:33:12 INFO - (xpcshell/head.js) | test pending (3)
[task 2020-01-22T19:33:12.522Z] 19:33:12 INFO - (xpcshell/head.js) | test finished (3)
[task 2020-01-22T19:33:12.522Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 179] 1 == 1
[task 2020-01-22T19:33:12.522Z] 19:33:12 INFO - (xpcshell/head.js) | test pending (3)
[task 2020-01-22T19:33:12.522Z] 19:33:12 INFO - (xpcshell/head.js) | test finished (3)
[task 2020-01-22T19:33:12.522Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 179] 1 == 1
[task 2020-01-22T19:33:12.522Z] 19:33:12 INFO - (xpcshell/head.js) | test pending (3)
[task 2020-01-22T19:33:12.522Z] 19:33:12 INFO - (xpcshell/head.js) | test finished (3)
[task 2020-01-22T19:33:12.522Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 179] 1 == 1
[task 2020-01-22T19:33:12.522Z] 19:33:12 INFO - (xpcshell/head.js) | test pending (3)
[task 2020-01-22T19:33:12.523Z] 19:33:12 INFO - (xpcshell/head.js) | test finished (3)
[task 2020-01-22T19:33:12.523Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 179] 1 == 1
[task 2020-01-22T19:33:12.523Z] 19:33:12 INFO - (xpcshell/head.js) | test pending (3)
[task 2020-01-22T19:33:12.524Z] 19:33:12 INFO - (xpcshell/head.js) | test finished (3)
[task 2020-01-22T19:33:12.524Z] 19:33:12 INFO - (xpcshell/head.js) | test finished (2)
[task 2020-01-22T19:33:12.524Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | undefined assertion name - "cookie-db-rebuilding" == "cookie-db-rebuilding"
[task 2020-01-22T19:33:12.524Z] 19:33:12 INFO - (xpcshell/head.js) | test pending (2)
[task 2020-01-22T19:33:12.524Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 198] 1 == 1
[task 2020-01-22T19:33:12.524Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 199] 1 == 1
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 200] 2 == 2
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - (xpcshell/head.js) | test finished (2)
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | undefined assertion name - "cookie-db-closed" == "cookie-db-closed"
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 208] true == true
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 210] 1 == 1
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 216] "cookie-db-read" == "cookie-db-read"
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 216] 1 == 1
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 218] 1 == 1
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 220] "hallo" == "hallo"
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | undefined assertion name - "cookie-db-closed" == "cookie-db-closed"
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 229] true == true
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_1 - [run_test_1 : 230] true == true
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | run_test_2 - [run_test_2 : 237] "cookie-db-read" == "cookie-db-read"
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - TEST-PASS | netwerk/test/unit/test_cookies_async_failure.js | undefined assertion name - "cookie-db-closed" == "cookie-db-closed"
[task 2020-01-22T19:33:12.525Z] 19:33:12 WARNING - TEST-UNEXPECTED-FAIL | netwerk/test/unit/test_cookies_async_failure.js | do_corrupt_db - [do_corrupt_db : 101] false == true
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - test_cookies_async_failure.js:do_corrupt_db:101
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - test_cookies_async_failure.js:run_test_2:249
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - /sdcard/tests/xpc/netwerk/test/unit/head_cookies.js:do_run_generator:46
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - /sdcard/tests/xpc/netwerk/test/unit/head_cookies.js:observe:75
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - /sdcard/tests/xpc/head.js:_do_main:246
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - /sdcard/tests/xpc/head.js:_execute_test:573
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - -e:null:1
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - exiting test
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - caught exception [Exception... "Abort" nsresult: "0x80004004 (NS_ERROR_ABORT)" location: "JS frame :: /sdcard/tests/xpc/head.js :: _abort_failed_test :: line 791" data: no]
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - /sdcard/tests/xpc/netwerk/test/unit/head_cookies.js:observe:75
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - /sdcard/tests/xpc/head.js:_do_main:246
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - /sdcard/tests/xpc/head.js:_execute_test:573
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - -e:null:1
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - exiting test
[task 2020-01-22T19:33:12.525Z] 19:33:12 INFO - netwerk/test/unit/test_cookies_async_failure.js | JavaScript error: /sdcard/tests/xpc/head.js, line 791: NS_ERROR_ABORT:
[task 2020-01-22T19:33:12.526Z] 19:33:12 INFO - "CONSOLE_MESSAGE: (error) [JavaScript Error: "NS_ERROR_ABORT: " {file: "/sdcard/tests/xpc/head.js" line: 791}]"
[task 2020-01-22T19:33:12.526Z] 19:33:12 INFO - <<<<<<<
[task 2020-01-22T19:33:13.711Z] 19:33:13 INFO - TEST-START | netwerk/test/unit/test_cookies_persistence.js
[task 2020-01-22T19:33:13.711Z] 19:33:13 INFO - TEST-SKIP | netwerk/test/unit/test_cookies_persistence.js | took 0ms

Flags: needinfo?(ehsan)
Pushed by eakhgari@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/c930febec76e
Remove the obsolete baseDomain field of the moz_cookies table; r=baku

do_corrupt_db() wasn't working correctly on Android (and apparently sometimes on desktop) because the size estimate used in it was too large. Bringing it down to 320kb seems to have fixed it.

Flags: needinfo?(ehsan)
Status: ASSIGNED → RESOLVED
Closed: 2 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla74

== Change summary for alert #24801 (as of Sun, 26 Jan 2020 09:11:37 GMT) ==

Improvements:

3% tp5n nonmain_startup_fileio windows7-32-shippable opt e10s stylo 3,411,932.67 -> 3,309,988.92

For up to date results, see: https://treeherder.mozilla.org/perf.html#/alerts?id=24801

(In reply to Florin Strugariu [:Bebe] (needinfo me) from comment #9)

== Change summary for alert #24801 (as of Sun, 26 Jan 2020 09:11:37 GMT) ==

Improvements:

3% tp5n nonmain_startup_fileio windows7-32-shippable opt e10s stylo 3,411,932.67 -> 3,309,988.92

For up to date results, see: https://treeherder.mozilla.org/perf.html#/alerts?id=24801

This is a welcome and expected performance improvement as a result of this change, since we reduced the amount of sqlite queries we invoke when initializing cookies.sqlite.

You need to log in before you can comment on or make changes to this bug.