From e3994f2975287b459692d8a347f3f33fffa08bda Mon Sep 17 00:00:00 2001 From: drh <> Date: Wed, 2 Mar 2022 11:39:11 +0000 Subject: [PATCH] The optimization at [ece326db50201937] is not quite right, so back it out for now. FossilOrigin-Name: b218a4b9fe44ffc5cb8d2a2491a5aad217d37b26ccc6b04caf8f28b71bcfe809 --- manifest | 13 +++++++------ manifest.uuid | 2 +- src/pager.c | 7 ++++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 1925c433f7..c33545bdf8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sharmless\scompiler\swarning. -D 2022-03-02T01:02:16.787 +C The\soptimization\sat\s[ece326db50201937]\sis\snot\squite\sright,\sso\sback\sit\sout\nfor\snow. +D 2022-03-02T11:39:11.573 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -539,7 +539,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586 F src/os_unix.c f5ad51cfd024116db8531feab9efd831c2621436dca1464e4ff1e8af9bf3252e F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a -F src/pager.c 1c415888b3658513c26a79b6a61989ca6463d3770102e6c24372fd7235022b02 +F src/pager.c 42120492784fc9bcd9082b5c9b5e329b7318c357f9f3574a1bbfcf7418910356 F src/pager.h f82e9844166e1585f5786837ddc7709966138ced17f568c16af7ccf946c2baa3 F src/parse.y 0f02b27cdaa334441463153fff3ceb780fea006ab53ffd6ef566d4468f93e924 F src/pcache.c 0aab73936341fad83d107cf62c6a7bc2d2d5fb9aaec8c3ce61e19fc18e4560fc @@ -1944,8 +1944,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 15f73b121cacf77ada02bfe434f9caa1175ac482d007156cfb0864e4221490d1 -R 92cb4b3e8b72c08af06d80ae9f960ec3 +P 6497997aa80419688890ed5dbbb7d6acc26bf3732305ff4a728cba1fe4d1626b +Q -ece326db50201937eb688809df39edc7fb97413b4614d2e2e783418192f7b02a +R 6e3d2a70dcfbb60b44acaa137825df92 U drh -Z f78232375c28b78519d89054564af79f +Z 2c1c2df4762c35de9490f72bfde9d5c8 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d12eabcabf..8f223b6ba7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6497997aa80419688890ed5dbbb7d6acc26bf3732305ff4a728cba1fe4d1626b \ No newline at end of file +b218a4b9fe44ffc5cb8d2a2491a5aad217d37b26ccc6b04caf8f28b71bcfe809 \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index 33ed31d7ad..b6a0cdfca8 100644 --- a/src/pager.c +++ b/src/pager.c @@ -5494,6 +5494,7 @@ static int getPageNormal( assert( assert_pager_state(pPager) ); assert( pPager->hasHeldSharedLock==1 ); + if( pgno==0 ) return SQLITE_CORRUPT_BKPT; pBase = sqlite3PcacheFetch(pPager->pPCache, pgno, 3); if( pBase==0 ){ pPg = 0; @@ -5521,10 +5522,10 @@ static int getPageNormal( /* The pager cache has created a new page. Its content needs to ** be initialized. But first some error checks: ** - ** (1) Never try to fetch the locking page - ** (2) Never try to fetch page 0, which does not exist + ** (*) obsolete. Was: maximum page number is 2^31 + ** (2) Never try to fetch the locking page */ - if( pgno==PAGER_SJ_PGNO(pPager) || pgno==0 ){ + if( pgno==PAGER_SJ_PGNO(pPager) ){ rc = SQLITE_CORRUPT_BKPT; goto pager_acquire_err; }