commit 090e844bce774c78ca80d396a12f9bbd140642f6
author Jeffrey Brown <jeffbrown@android.com> Wed Feb 06 20:56:09 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 06 20:56:09 2013 -0800
tree bdd32db4ed9fd642bc2f2afa0c33c6b91cf818bb
parent 2d7d7ad4e722a6b6b60b9afd3b0496e378fd7780
parent 6bbf67c11ea1b7e8e9769113072c167e822fe73f

am 6bbf67c1: Merge changes Ieecda65d,Idf3cbdab

# By Yongil Jang (1) and git-lg-database.lge.com (1)
# Via Gerrit Code Review (1) and git-lg-database.lge.com (1)
* commit '6bbf67c11ea1b7e8e9769113072c167e822fe73f':
  Fix bugs of database corruption following IO error on systems supporting atomic-write
  Fix bugs of sqlite that returns SIGBUS on disk full in WAL mode

dist/sqlite3.c

diff --git a/dist/sqlite3.c b/dist/sqlite3.c
index 8cdf8de..a43031b 100644
--- a/dist/sqlite3.c
+++ b/dist/sqlite3.c
@@ -24853,6 +24853,13 @@
 */
 #if SQLITE_OS_UNIX              /* This file is used on unix only */
 
+/* Use posix_fallocate() if it is available
+*/
+#if !defined(HAVE_POSIX_FALLOCATE) \
+      && (_XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L)
+# define HAVE_POSIX_FALLOCATE 1
+#endif
+
 /*
 ** There are various methods for file locking used for concurrency
 ** control:
@@ -29091,11 +29098,19 @@
         ** the requested memory region.
         */
         if( !bExtend ) goto shmpage_out;
+#if defined(HAVE_POSIX_FALLOCATE) && HAVE_POSIX_FALLOCATE
+        if( osFallocate(pShmNode->h, sStat.st_size, nByte)!=0 ){
+          rc = unixLogError(SQLITE_FULL, "fallocate",
+                            pShmNode->zFilename);
+          goto shmpage_out;
+        }
+#else
         if( robust_ftruncate(pShmNode->h, nByte) ){
           rc = unixLogError(SQLITE_IOERR_SHMSIZE, "ftruncate",
                             pShmNode->zFilename);
           goto shmpage_out;
         }
+#endif
       }
     }
 
@@ -72599,6 +72614,14 @@
         assert(p->iSize<=p->nBuf);
         rc = sqlite3OsWrite(p->pReal, p->zBuf, p->iSize, 0);
       }
+      if( rc!=SQLITE_OK ){
+        /* If an error occurred while writing to the file, close it before
+        ** returning. This way, SQLite uses the in-memory journal data to
+        ** roll back changes made to the internal page-cache before this
+        ** function was called.  */
+        sqlite3OsClose(pReal);
+        p->pReal = 0;
+      }
     }
   }
   return rc;