From: drh <drh@noemail.net>
Date: Tue, 9 Nov 2010 01:53:48 +0000 (+0000)
Subject: Back out the prior attempt to enable full-fsync for WAL and attempt the same
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c0b44a552cfe1af061be26b7e2e35ad52b4c0ce;p=thirdparty%2Fsqlite.git

Back out the prior attempt to enable full-fsync for WAL and attempt the same
thing using a completely different approach.

FossilOrigin-Name: f59949fac1776ea2f58f41ee8aef8dd95b67725a
---

8c0b44a552cfe1af061be26b7e2e35ad52b4c0ce
diff --cc manifest
index 9d783b39e9,62cf24b18e..5ee9f28c1b
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,8 @@@
- C Experimental\schanges\sto\stest\sdefaulting\sto\sfullfsync\sfor\sWAL\smode
- D 2010-11-09T00:47:46
 -C Integrated\sproxy\slocking\sfile\ssupport\sfor\sWAL\sjournal\smode\sand\sdouble\sfree\sfix
 -D 2010-11-09T00:43:59
++-----BEGIN PGP SIGNED MESSAGE-----
++Hash: SHA1
++
++C Back\sout\sthe\sprior\sattempt\sto\senable\sfull-fsync\sfor\sWAL\sand\sattempt\sthe\ssame\nthing\susing\sa\scompletely\sdifferent\sapproach.
++D 2010-11-09T01:53:48
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in c58f7d37ad0f9b28655ba4e28c6cb0f879569cd7
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -231,7 -231,7 +234,7 @@@ F src/vdbeblob.c 258a6010ba7a82b72b327f
  F src/vdbemem.c e5673f81a2381b35c60e73ef0a8502be2ab1041e
  F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
  F src/vtab.c 0e8e0cb30dffb078367e843e84e37ef99236c7e4
--F src/wal.c 5ac2119e23ee4424599d4275b66dc88d612a0543
++F src/wal.c 419914f47fe2c632d62e2e8f68917683b7e81500
  F src/wal.h 96669b645e27cd5a111ba59f0cae7743a207bc3c
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
  F src/where.c 7db3e41c2a846f9deeb24f1bbb75461b4010b7b5
@@@ -851,10 -851,7 +854,14 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P fd4d38fa66de85676189ff4922fb1bf5f8cac9c4
- R c98bc3ea3fd9fcd44a0bbad595d43ad1
- T *branch * apple-osx-exp
- T *sym-apple-osx-exp *
- T -sym-apple-osx *
 -P e01c5f3eda7fe6e6afe9c3894384f09b58173da1
 -R 0f46b01a6860ee53146a14c10ec341dc
--U adam
- Z 06fc038b80ed13bd5b68fa3606bfbfea
 -Z d51fce1db464c676813e4eba90c98e2f
++P 77b343cfc3bef9b1a99e98fec6073626dab05657 fd4d38fa66de85676189ff4922fb1bf5f8cac9c4
++R 3023c4e1d42906020afbe1f5e513b1f2
++U drh
++Z 0b9563616992466c031d218f11922948
++-----BEGIN PGP SIGNATURE-----
++Version: GnuPG v1.4.6 (GNU/Linux)
++
++iD8DBQFM2KmwoxKgR168RlERAiauAKCI1qDSxQkR6dO7p8jSJgiwE1ynBACeL7xT
++D2mdq8GqQe7zmNxnxNVQVBs=
++=Tv5T
++-----END PGP SIGNATURE-----
diff --cc manifest.uuid
index 558e984582,2d60ca9cf6..2a96a67df9
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 77b343cfc3bef9b1a99e98fec6073626dab05657
 -fd4d38fa66de85676189ff4922fb1bf5f8cac9c4
++f59949fac1776ea2f58f41ee8aef8dd95b67725a
diff --cc src/wal.c
index 22ce1fa77f,22ce1fa77f..01b7e497fc
--- a/src/wal.c
+++ b/src/wal.c
@@@ -1592,7 -1592,7 +1592,7 @@@ static int walCheckpoint
  
      /* Sync the WAL to disk */
      if( sync_flags ){
--      rc = sqlite3OsSync(pWal->pWalFd, sync_flags);
++      rc = sqlite3OsSync(pWal->pWalFd, sync_flags | SQLITE_SYNC_FULL );
      }
  
      /* If the database file may grow as a result of this checkpoint, hint
@@@ -1628,7 -1628,7 +1628,7 @@@
          testcase( IS_BIG_INT(szDb) );
          rc = sqlite3OsTruncate(pWal->pDbFd, szDb);
          if( rc==SQLITE_OK && sync_flags ){
--          rc = sqlite3OsSync(pWal->pDbFd, sync_flags);
++          rc = sqlite3OsSync(pWal->pDbFd, sync_flags | SQLITE_SYNC_FULL);
          }
        }
        if( rc==SQLITE_OK ){