Fix a problem in shared-cache mode where a COMMIT statement might cause a busy-handle...

FossilOrigin-Name: e0c889d66ccf4af12cc77ac38c1e6477da63ac72

diff --git a/manifest b/manifest
index a68030c33fd83aad4dfa5d949f7f1a6f68c001b1..848365489378aba56f6dac1ca8adb9403f7d622d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\sshared-cache\srelated\sfixes\sfrom\sthe\sshared-cache-fix\sbranch\sto\sthe\strunk.
-D 2012-10-05T17:44:51.191
+C Fix\sa\sproblem\sin\sshared-cache\smode\swhere\sa\sCOMMIT\sstatement\smight\scause\sa\sbusy-handler\sbelonging\sto\sa\sshared-cache\sconnection\sother\sthan\sthe\scurrent\swriter\sto\sbe\sinvoked.
+D 2012-10-05T19:43:02.225
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -240,7 +240,7 @@ F src/vdbe.c 31523df2b986fc6c959dd54ca640ba865884641b
 F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 F src/vdbeInt.h 573a43ab5697b648a1e8f3dfc7d8667d5ca55729
 F src/vdbeapi.c 4c2418161cf45392ba76a7ca92f9a5f06b96f89c
-F src/vdbeaux.c fac025c798ad19070451b41eddc5dcd4696fdd1e
+F src/vdbeaux.c 674e969e026d1af1938942eba17071127839fc15
 F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
 F src/vdbesort.c 0dc1b274dcb4d4c8e71b0b2b15261f286caba39b
@@ -702,7 +702,7 @@ F test/shared4.test 72d90821e8d2fc918a08f16d32880868d8ee8e9d
 F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9
 F test/shared7.test 960760bc8d03e1419e70dea69cf41db62853616e
 F test/shared8.test b27befbefbe7f4517f1d6b7ff8f64a41ec74165d
-F test/shared9.test 3a5b09583e3ba3139a4bd66958061306b4331c7e
+F test/shared9.test 43cbbe6f59bd49abd7e40ac653a4aa8596feafcd
 F test/shared_err.test 91e26ec4f3fbe07951967955585137e2f18993de
 F test/sharedlock.test ffa0a3c4ac192145b310f1254f8afca4d553eabf
 F test/shell1.test 272384163432c0efd2c6817396beb0d119565d53
@@ -1019,7 +1019,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 8ea67522fb03134f355ecb776b70c6917241cab2 82b6aa77c8d8de4c6fad1960f5958457a929a821
-R 25900bb7c1310d28535793e9cff3e6d9
+P 698ec7769d4feea1782401479c61ce67d2113fd4
+R f57e31f66af3653aafd36cef29db2f9f
 U dan
-Z 6fd03f9d2f9680aaf35bc79001b16899
+Z 7483039414b69be1ce1710f91dbcd117

diff --git a/manifest.uuid b/manifest.uuid
index 3e7db5616a3ff0610868772105525969fd850892..88cc72dd6b75dbaeaf7948ff4f09083ae786ecf9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-698ec7769d4feea1782401479c61ce67d2113fd4
\ No newline at end of file
+e0c889d66ccf4af12cc77ac38c1e6477da63ac72
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 9db3bf435c69c742c4507892b258ac7c58e92c08..405ea48b8973e02a54d63d2ee60fa148a697c500 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1770,7 +1770,9 @@ static int vdbeCommit(sqlite3 *db, Vdbe *p){
     if( sqlite3BtreeIsInTrans(pBt) ){
       needXcommit = 1;
       if( i!=1 ) nTrans++;
+      sqlite3BtreeEnter(pBt);
       rc = sqlite3PagerExclusiveLock(sqlite3BtreePager(pBt));
+      sqlite3BtreeLeave(pBt);
     }
   }
   if( rc!=SQLITE_OK ){

diff --git a/test/shared9.test b/test/shared9.test
index bb0dfee1868a7fa86b686147643419b88eb2449a..98485be68abd1b7111e3ae39db2111a60dd00ecc 100644 (file)
--- a/test/shared9.test
+++ b/test/shared9.test
@@ -16,6 +16,7 @@
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+source $testdir/lock_common.tcl
 set testprefix shared9
 
 ifcapable !view||!trigger {
@@ -135,6 +136,72 @@ do_test 2.4 {
   set ::invoked_mycollate_db1
 } {0}
 
+#-------------------------------------------------------------------------
+# This test verifies that a bug causing a busy-handler belonging to one
+# shared-cache connection to be executed as a result of an sqlite3_step()
+# on another has been fixed.
+#
+forcedelete test.db test.db2
+sqlite3 db1 test.db
+sqlite3 db2 test.db
+
+proc busyhandler {handle args} {
+  set ::busyhandler_invoked_for $handle
+  return 1
+}
+db1 busy [list busyhandler db1]
+db2 busy [list busyhandler db2]
+
+do_test 3.1 {
+  db1 eval {
+    BEGIN; 
+      CREATE TABLE t1(a, b);
+      CREATE TABLE t2(a, b);
+      INSERT INTO t1 VALUES(1, 2);
+      INSERT INTO t2 VALUES(1, 2);
+  }
+  # Keep this next COMMIT as a separate statement. This ensures that COMMIT
+  # has already been compiled and loaded into the tcl interface statement 
+  # cache when it is attempted below.
+  db1 eval COMMIT
+  db1 eval {
+    BEGIN;
+      INSERT INTO t1 VALUES(3, 4);
+  }
+} {}
+
+do_test 3.3 {
+  set ::tf [launch_testfixture]
+  testfixture $::tf {
+    sqlite3 db test.db
+    db eval {
+      BEGIN;
+        SELECT * FROM t1;
+    }
+  }
+} {1 2}
+
+do_test 3.2 {
+  db2 eval { SELECT * FROM t2 }
+} {1 2}
+
+do_test 3.3 {
+  list [catch { db1 eval COMMIT } msg] $msg
+} {1 {database is locked}}
+
+# At one point the following would fail, showing that the busy-handler
+# belonging to [db2] was invoked instead.
+do_test 3.4 {
+  set ::busyhandler_invoked_for
+} {db1}
+do_test 3.5 {
+  close $::tf
+  db1 eval COMMIT
+} {}
+  
+db1 close
+db2 close
+
 sqlite3_enable_shared_cache $::enable_shared_cache
 finish_test