Avoid automatically rolling back the transaction if an SQLITE_IOERR or SQLITE_FULL...

FossilOrigin-Name: 370b5d520c6523526988d0db5299f1bd09567782

diff --git a/manifest b/manifest
index 866a53b656cda1dbad2e85878697eb7e3ae67597..4ea95b624f4ca58d972b23b15e5ffa8593189a49 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sexperimental\sAPI\ssqlite3_db_cacheflush().
-D 2015-10-28T19:46:57.460
+C Avoid\sautomatically\srolling\sback\sthe\stransaction\sif\san\sSQLITE_IOERR\sor\sSQLITE_FULL\serror\soccurs\swithin\ssqlite3_db_cacheflush().
+D 2015-10-29T18:16:40.382
 F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
@@ -305,7 +305,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 F src/lempar.c d344a95d60c24e2f490ee59db9784b1b17439012
 F src/loadext.c 18586e45a215325f15096821e9c082035d4fb810
-F src/main.c b9d020342b2a2b13808c6260792ef233d7af5b1d
+F src/main.c f393acc6e5d604cbe0054376d62f668a5560b3f1
 F src/malloc.c 337bbe9c7d436ef9b7d06b5dd10bbfc8f3025972
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@ -327,7 +327,7 @@ F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 F src/os_unix.c fc93d55f96bb978f0b0168c6ea7d6fc60b0e172c
 F src/os_win.c 1716291e5ec2dbfc5a1fe0b32182030f1f7d8acf
 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
-F src/pager.c 059991ce76b1a857cb84dd2469cfcfaaae1d77fa
+F src/pager.c 2f9de81ebc87f92814ffc1e34f478a6de7c869b0
 F src/pager.h 1c4fa826c330040c5659a384446c7cc6e8e4200c
 F src/parse.y 11078cd8e3af00f030505b6a86a06a4536cfdeaa
 F src/pcache.c 24be750c79272e0ca7b6e007bc94999700f3e5ef
@@ -342,7 +342,7 @@ F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c 167b4e9058bc8e997d18d6b6b20ecbb0c9c457af
 F src/shell.c d25df04168d6ba5a4fa05bdbf859df667f9eb621
-F src/sqlite.h.in e7da8d15141d0753bfe14945bd64592a42575c04
+F src/sqlite.h.in 3cfc86c55e57c63d86b9e1e92869e2bfb162ca8e
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
 F src/sqliteInt.h b1e72ffe282c91ae30a2bf403319126dbaebd556
@@ -511,7 +511,7 @@ F test/capi3c.test fdc0d67a2cb8e8fc400d5b7735e330161ea057a2
 F test/capi3d.test 485048dc5cd07bc68011e4917ad035ad6047ab82
 F test/capi3e.test 3d49c01ef2a1a55f41d73cba2b23b5059ec460fe
 F test/cast.test 4c275cbdc8202d6f9c54a3596701719868ac7dc3
-F test/cffault.test 1383919788fa50db60f6119da5785c62fbc8b527
+F test/cffault.test 1647eef45512817265c360ed4539538eed26ac69
 F test/check.test 5831ddb6f2c687782eaf2e1a07b6e17f24c4f763
 F test/close.test 340bd24cc58b16c6bc01967402755027c37eb815
 F test/closure01.test b1703ba40639cfc9b295cf478d70739415eec6a4
@@ -1397,10 +1397,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 001854181640bd9b088f2bc16083d84808c3da18
-R 2dbc861fa3cf60b53d3ec06b17c9981a
-T *branch * cacheflush
-T *sym-cacheflush *
-T -sym-trunk *
+P 65b86dc1fa4a57cc3cde86a820d9f848aa288a15
+R a2eb49b0b44e5f6d387cfe5db61ab944
 U dan
-Z c07109c8cca9fe678b00367209f93a20
+Z 0108dff3f79bd94c840ccf22fb26067f

diff --git a/manifest.uuid b/manifest.uuid
index ac6d5b874acedcbcd7e44584195713ff304878bc..114b47522f5d55d69f7e840819ec5aea76617b62 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-65b86dc1fa4a57cc3cde86a820d9f848aa288a15
\ No newline at end of file
+370b5d520c6523526988d0db5299f1bd09567782
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 324415b0cf590735c585bf80a66580ea1d236244..56d458849436a57948d3a42235ce1b2f2270ced1 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -765,9 +765,6 @@ int sqlite3_db_cacheflush(sqlite3 *db){
       }
     }
   }
-  if( rc!=SQLITE_OK ){
-    sqlite3RollbackAll(db, SQLITE_ABORT_ROLLBACK);
-  }
   sqlite3BtreeLeaveAll(db);
   sqlite3_mutex_leave(db->mutex);
   return ((rc==SQLITE_OK && bSeenBusy) ? SQLITE_BUSY : rc);

diff --git a/src/pager.c b/src/pager.c
index f21f0802bac958cc4246c423c0795b2a07f327f6..09d4935f274f46252510c39f10b53581d7d51e79 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -4477,9 +4477,10 @@ static int pagerStress(void *p, PgHdr *pPg){
 ** Flush all unreferenced dirty pages to disk.
 */
 int sqlite3PagerFlush(Pager *pPager){
-  int rc = SQLITE_OK;
+  int rc = pPager->errCode;
   PgHdr *pList = sqlite3PcacheDirtyList(pPager->pPCache);
 
+  assert( assert_pager_state(pPager) );
   while( rc==SQLITE_OK && pList ){
     PgHdr *pNext = pList->pDirty;
     if( pList->nRef==0 ){
@@ -6093,14 +6094,17 @@ int sqlite3PagerSync(Pager *pPager, const char *zMaster){
 ** returned.
 */
 int sqlite3PagerExclusiveLock(Pager *pPager){
-  int rc = SQLITE_OK;
-  assert( pPager->eState==PAGER_WRITER_CACHEMOD 
-       || pPager->eState==PAGER_WRITER_DBMOD 
-       || pPager->eState==PAGER_WRITER_LOCKED 
-  );
+  int rc = pPager->errCode;
   assert( assert_pager_state(pPager) );
-  if( 0==pagerUseWal(pPager) ){
-    rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK);
+  if( rc==SQLITE_OK ){
+    assert( pPager->eState==PAGER_WRITER_CACHEMOD 
+         || pPager->eState==PAGER_WRITER_DBMOD 
+         || pPager->eState==PAGER_WRITER_LOCKED 
+    );
+    assert( assert_pager_state(pPager) );
+    if( 0==pagerUseWal(pPager) ){
+      rc = pager_wait_on_lock(pPager, EXCLUSIVE_LOCK);
+    }
   }
   return rc;
 }

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 6c04ff5102889af31ad9dca46e350a7d2a5f91f3..961c5169fc7167500446867b07dcc481ce07c831 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -7814,7 +7814,6 @@ void sqlite3_stmt_scanstatus_reset(sqlite3_stmt*);
 ** If any other error occurs while flushing dirty pages to disk (for
 ** example an IO error or out-of-memory condition), then processing is
 ** abandoned and an SQLite error code returned to the caller immediately.
-** In this case the open transaction may be automatically rolled back.
 **
 ** Otherwise, if no error occurs, SQLITE_OK is returned.
 **

diff --git a/test/cffault.test b/test/cffault.test
index e90bbac55f12a3ae6037217de860ceecfdb9df0f..a89477b61704a3a90a420e243405b168d8ee603c 100644 (file)
--- a/test/cffault.test
+++ b/test/cffault.test
@@ -38,7 +38,7 @@ do_execsql_test 1.0 {
 }
 faultsim_save_and_close
 
-do_faultsim_test 1 -prep {
+do_faultsim_test 1.1 -prep {
   faultsim_restore_and_reopen
   db eval {
     BEGIN;
@@ -47,11 +47,113 @@ do_faultsim_test 1 -prep {
 } -body {
   sqlite3_db_cacheflush db
 } -test {
+  if {[sqlite3_get_autocommit db]} { error "Transaction rolled back!" }
   faultsim_test_result {0 {}} {1 {disk I/O error}}
   catch { db eval COMMIT }
   faultsim_integrity_check
 }
 
+do_faultsim_test 1.2 -prep {
+  faultsim_restore_and_reopen
+  db eval {
+    BEGIN;
+      UPDATE t1 SET b=b+1;
+  }
+} -body {
+  set result [list]
+  db eval { SELECT * FROM t1 } {
+    if {$a==5} { catch { sqlite3_db_cacheflush db } }
+    lappend result $a $b
+  }
+  set result
+} -test {
+  faultsim_test_result {0 {1 3 3 5 5 7 7 9}} {1 {disk I/O error}}
+  catch { db eval COMMIT }
+  faultsim_integrity_check
+}
+
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 2.0 {
+  CREATE TABLE t1(a PRIMARY KEY, b, c);
+  CREATE INDEX i1 ON t1(b);
+  CREATE INDEX i2 ON t1(c, b);
+  INSERT INTO t1 VALUES(1, 2,  randomblob(600));
+  INSERT INTO t1 VALUES(3, 4,  randomblob(600));
+  INSERT INTO t1 VALUES(5, 6,  randomblob(600));
+  INSERT INTO t1 VALUES(7, 8,  randomblob(600));
+  INSERT INTO t1 VALUES(9, 10, randomblob(600));
+}
+faultsim_save_and_close
+
+do_faultsim_test 2.1 -prep {
+  faultsim_restore_and_reopen
+  db eval {
+    BEGIN;
+      UPDATE t1 SET b=b+1;
+  }
+} -body {
+  set result [list]
+  db eval { SELECT * FROM t1 } {
+    if {$a==5} { catch { sqlite3_db_cacheflush db } }
+    lappend result $a $b
+  }
+  set result
+} -test {
+  faultsim_test_result {0 {1 3 3 5 5 7 7 9 9 11}} {1 {disk I/O error}}
+  catch { db eval { INSERT INTO t1 VALUES(11, 12, randomblob(600)) } }
+  catch { db eval COMMIT }
+  faultsim_integrity_check
+}
+
+do_faultsim_test 2.2 -prep {
+  faultsim_restore_and_reopen
+  db eval {
+    BEGIN;
+      UPDATE t1 SET b=b+1;
+  }
+} -body {
+  sqlite3_db_cacheflush db
+} -test {
+  if {[sqlite3_get_autocommit db]} { error "Transaction rolled back!" }
+  faultsim_test_result {0 {}} {1 {disk I/O error}}
+  catch { db eval { SELECT * FROM t1 } }
+  catch { db eval COMMIT }
+  faultsim_integrity_check
+}
+
+do_faultsim_test 2.3 -prep {
+  faultsim_restore_and_reopen
+  db eval {
+    BEGIN;
+      UPDATE t1 SET b=b-1;
+  }
+} -body {
+  sqlite3_db_cacheflush db
+} -test {
+  if {[sqlite3_get_autocommit db]} { error "Transaction rolled back!" }
+  faultsim_test_result {0 {}} {1 {disk I/O error}}
+  catch { db eval { INSERT INTO t1 VALUES(11, 12, randomblob(600)) } }
+  catch { db eval COMMIT }
+  faultsim_integrity_check
+}
+
+do_faultsim_test 2.4 -prep {
+  faultsim_restore_and_reopen
+  db eval {
+    BEGIN;
+      UPDATE t1 SET b=b-1;
+  }
+} -body {
+  catch { sqlite3_db_cacheflush db }
+  catch { sqlite3_db_release_memory db }
+  catch { sqlite3_db_cacheflush db }
+  execsql { SELECT a, b FROM t1 }
+} -test {
+  faultsim_test_result {0 {1 1 3 3 5 5 7 7 9 9}} {1 {disk I/O error}}
+  catchsql ROLLBACK
+  faultsim_integrity_check
+}
 
 finish_test