Add an sqlite3FaultSim() to make an OOM case more accessible and remove

the ALWAYS() on the conditional that is false when the OOM actually occurs.

FossilOrigin-Name: 2a251af84ff1f5ca281aa69c5410d6ae7aa5a85ef47149909a297525e1651e9d

diff --git a/manifest b/manifest
index d06cad05e5933b6d25d9f07108860d5371576bdb..ef7faf53dc8176b420465523ead6952524c957dd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C On\srecovery,\salways\soverwrite\sthe\sold\swith\sthe\snew,\seven\sif\sthey\sare\sthe\ssame.\nAdd\sALWAYS()\smacros\son\sbranches\scurrently\sthought\sto\sbe\sunreachable,\spending\nadditional\stesting.
-D 2020-07-27T20:16:37.459
+C Add\san\ssqlite3FaultSim()\sto\smake\san\sOOM\scase\smore\saccessible\sand\sremove\nthe\sALWAYS()\son\sthe\sconditional\sthat\sis\sfalse\swhen\sthe\sOOM\sactually\soccurs.
+D 2020-07-28T17:17:36.521
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -619,7 +619,7 @@ F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143
 F src/vdbevtab.c ee5b4c902fdda2230f9503ac7b84c6d614c91e8f6f4dc1633e2e8dfef8ffb144
 F src/vtab.c 5f5fc793092f53bbdfde296c50f563fb7bda58cf48e9cf6a8bdfbc5abd409845
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-F src/wal.c 5d62c14b7865586cf012ba9e2cafc92313a61cbb1824106a3ac49f2ef957e8bc
+F src/wal.c 788fc787c608ea9e29a4438f61348b02230dfd538bb0d4ceed704086dc4aec09
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c 3df26a33dc4f54e8771600fb7fdebe1ece0896c2ad68c30ab40b017aa4395049
 F src/where.c 2ea911238674e9baaeddf105dddabed92692a01996073c4d4983f9a7efe481f9
@@ -1878,7 +1878,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 3af61e83532f76f0f3252a28663415d37b096ddf05a9c58fa79303933c09abce
-R 90cfb5314d321e24c6c38b0cec33d99b
+P 7052cf1d533f6404d0f45cf0b3e8a11c1ee27eccb64680a7fd308c8da7cbd544
+R 69a29ce092f5af857bcf59873f5056ae
 U drh
-Z 7af3dd79e9571635c50343a91786c8f5
+Z e3e8c0f9a7476656806546b877310ca8

diff --git a/manifest.uuid b/manifest.uuid
index 04e79db75ea8765b43cfc0c0b5042504af437fc5..083a662fb35522a86f27a998595f2b07f3121260 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7052cf1d533f6404d0f45cf0b3e8a11c1ee27eccb64680a7fd308c8da7cbd544
\ No newline at end of file
+2a251af84ff1f5ca281aa69c5410d6ae7aa5a85ef47149909a297525e1651e9d
\ No newline at end of file

diff --git a/src/wal.c b/src/wal.c
index 262824e59fd617fc4aa13bbffe7b13cfcf45e840..0b3250ffaad83f2b0773710d9015879c1e3b8696 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -590,7 +590,9 @@ static SQLITE_NOINLINE int walIndexPageRealloc(
     );
     assert( pWal->apWiData[iPage]!=0 || rc!=SQLITE_OK || pWal->writeLock==0 );
     testcase( pWal->apWiData[iPage]==0 && rc==SQLITE_OK );
-    if( (rc&0xff)==SQLITE_READONLY ){
+    if( rc==SQLITE_OK ){
+      if( iPage>0 && sqlite3FaultSim(600) ) rc = SQLITE_NOMEM;
+    }else if( (rc&0xff)==SQLITE_READONLY ){
       pWal->readOnly |= WAL_SHM_RDONLY;
       if( rc==SQLITE_READONLY ){
         rc = SQLITE_OK;
@@ -1062,7 +1064,7 @@ static int walIndexAppend(Wal *pWal, u32 iFrame, u32 iPage){
   /* Assuming the wal-index file was successfully mapped, populate the
   ** page number array and hash table entry.
   */
-  if( ALWAYS(rc==SQLITE_OK) ){
+  if( rc==SQLITE_OK ){
     int iKey;                     /* Hash table key */
     int idx;                      /* Value to write to hash-table slot */
     int nCollide;                 /* Number of hash collisions */