Instead of a root page number, log the object (table or index) name if a page

level locking conflict is detected.

FossilOrigin-Name: 9ad846e57bd427adc7c29768cabca18905f7f978168e0642a5917d894fda8bfd

diff --git a/manifest b/manifest
index 9c926fb54c1c3252eed648c564f5c841c84fc4ed..7d09c7ae3f781b3e6b06541592911305a43f125f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\slog\smessages\semitted\swhen\sa\spage\sconflict\sis\sdetected.
-D 2017-05-29T14:27:37.696
+C Instead\sof\sa\sroot\spage\snumber,\slog\sthe\sobject\s(table\sor\sindex)\sname\sif\sa\spage\nlevel\slocking\sconflict\sis\sdetected.
+D 2017-05-29T19:23:56.135
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@ -350,7 +350,7 @@ F src/auth.c 79f96c6f33bf0e5da8d1c282cee5ebb1852bb8a6ccca3e485d7c459b035d9c3c
 F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
 F src/bitvec.c c77b7f5759e413c1c8b53267d633c952e66db79c1171964c7e24c0f92f5019cf
 F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
-F src/btree.c 3c5409453a17294ed8fe7b44dc87c0434b2418f447ad768f4624ead69d5dfa18
+F src/btree.c 8be55b3e9ed1346b5cfd3f749e6c338ced1cade9242a3c5404696bc4aed26652
 F src/btree.h 14e99cc2b666beb60322173c761d16b668ec2e07c18bbb74e8a49fe85946f8a0
 F src/btreeInt.h 7429915fc8f51bbd78b7ac023aa4afbe5b9660fc1e6970f144b07540a34a4623
 F src/build.c ba3f389668754c407805bbc5f8ab140f063ba6b04a6a86f63006b63b3c7319a8
@@ -394,8 +394,8 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
 F src/os_win.c 2a6c73eef01c51a048cc4ddccd57f981afbec18a
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c 079884c8486596240e200f1e37e867b1ed56eff399e4bbbcabcc145dc5679cd5
-F src/pager.h 1afb4b777b3a297d56dc6cafc4f17d47d92522e9d2cb106839ea0fa0d6d489c7
+F src/pager.c 817afaac17f7c4b1282d9aa283f10fc4b58d5d1e4afb12f84c46038904311650
+F src/pager.h ba7b3fbb18f78835a7368d66530bf21d6782e3e640d79c9550d218742c0b07ce
 F src/parse.y 21660e5224d1e1635a4ad45ad4365c8f67153b8081b7a11e35629844ecb48ab0
 F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
 F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
@@ -485,8 +485,8 @@ F src/vdbesort.c e72fe02a2121386ba767ede8942e9450878b8fc873abf3d1b6824485f092570
 F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
 F src/vtab.c 35b9bdc2b41de32a417141d12097bcc4e29a77ed7cdb8f836d1d2305d946b61b
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-F src/wal.c 4b857e74548bb0f9bc0c7f56517327421f925b1263ac65a6e58e9c176194857e
-F src/wal.h 79378c5cd2127f32060d4952d827a7abdd490f8f9e5cbb14a4c39657ed99ad15
+F src/wal.c e006353c3578071a457888aedd5eec9c8f1ba31ba11ddac4084c91c80478ca16
+F src/wal.h 1ea51dc499d6451529b822a8aaac053eafeef10b7fd9e5a4c9cc413182be429f
 F src/walker.c b71a992b413b3a022572eccf29ef4b4890223791
 F src/where.c c6352f15be5031907c68bcbde96cad1a6da20e9f4051d10168a59235de9a8566
 F src/whereInt.h 2a4b634d63ce488b46d4b0da8f2eaa8f9aeab202bc25ef76f007de5e3fba1f20
@@ -613,7 +613,7 @@ F test/concurrent.test 3eb5e6a911dc6ff72e3a679f563e683b436f6c701e6e1d6050173df2b
 F test/concurrent2.test 9dfbeb0a323733fe1d13443371734bb94a674dbf777f464365475903873111f8
 F test/concurrent3.test 0a5f7e3036d1eccf0782d7153ac21f5f222e9468
 F test/concurrent4.test 989c6575225f9c4ef5d2392a9b9d0405665567c7501a3e44129598794d9b1b5f
-F test/concurrent5.test 06fd0b5294586d170a3b12d68153394fbfe642c8346e249a6240bc6ababc5f4b
+F test/concurrent5.test d5d7d9d404a9b4502464fc097c1fc5c3012bb4f1b063fae7ad707ca983fc86c5
 F test/conflict.test 029faa2d81a0d1cafb5f88614beb663d972c01db
 F test/conflict2.test bb0b94cf7196c64a3cbd815c66d3ee98c2fecd9c
 F test/conflict3.test a83db76a6c3503b2fa057c7bfb08c318d8a422202d8bc5b86226e078e5b49ff9
@@ -1591,7 +1591,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 a7e0e7a4835314a04e065839a7f88b074eda795da2b2da5741b2afc096421a32
-R beb58ff81a99fbcff0806ad7e4f3b8ee
+P 92618492b048867af38922825f3d094eaaa2dd919b1ed2f7372483cc53f892bf
+R 9903c08299ff258c04c9dfdcdc90aac6
 U dan
-Z a8b4d17828fb801d4b09ca76008d7042
+Z 4393c020077681d651727b37beafcbae

diff --git a/manifest.uuid b/manifest.uuid
index d27dbec94161e88fb8c299fec071a06244318eed..cee4fdfd926e836a02fcfd889d44b4e62d2ce6ea 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-92618492b048867af38922825f3d094eaaa2dd919b1ed2f7372483cc53f892bf
\ No newline at end of file
+9ad846e57bd427adc7c29768cabca18905f7f978168e0642a5917d894fda8bfd
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index e9a09b69bdeb2956d0c630816eeb9079b5f625fd..38dfbccf41b62aa3ed7e311871c3ee4335f2b181 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -10286,10 +10286,60 @@ int sqlite3HeaderSizeBtree(void){ return ROUND8(sizeof(MemPage)); }
 */
 int sqlite3BtreeExclusiveLock(Btree *p){
   int rc;
+  Pgno pgno = 0;
   BtShared *pBt = p->pBt;
   assert( p->inTrans==TRANS_WRITE && pBt->pPage1 );
   sqlite3BtreeEnter(p);
-  rc = sqlite3PagerExclusiveLock(pBt->pPager, pBt->pPage1->pDbPage);
+  rc = sqlite3PagerExclusiveLock(pBt->pPager, pBt->pPage1->pDbPage, &pgno);
+  if( rc==SQLITE_BUSY_SNAPSHOT && pgno ){
+    PgHdr *pPg = 0;
+    int rc2 = sqlite3PagerGet(pBt->pPager, pgno, &pPg, 0);
+    if( rc2==SQLITE_OK ){
+      int bWrite = -1;
+      const char *zObj = 0;
+      const char *zTab = 0;
+
+      if( pPg ){
+        Pgno pgnoRoot = 0;
+        HashElem *pE;
+        Schema *pSchema;
+
+        pgnoRoot = ((MemPage*)sqlite3PagerGetExtra(pPg))->pgnoRoot;
+        bWrite = sqlite3PagerIswriteable(pPg);
+        sqlite3PagerUnref(pPg);
+
+        pSchema = sqlite3SchemaGet(p->db, p);
+        if( pSchema ){
+          for(pE=sqliteHashFirst(&pSchema->tblHash); pE; pE=sqliteHashNext(pE)){
+            Table *pTab = (Table *)sqliteHashData(pE);
+            if( pTab->tnum==(int)pgnoRoot ){
+              zObj = pTab->zName;
+              zTab = 0;
+            }else{
+              Index *pIdx;
+              for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+                if( pIdx->tnum==(int)pgnoRoot ){
+                  zObj = pIdx->zName;
+                  zTab = pTab->zName;
+                }
+              }
+            }
+          }
+        }
+      }
+
+      sqlite3_log(SQLITE_OK,
+          "cannot commit CONCURRENT transaction "
+          "- conflict at page %d "
+          "(%s page; part of db %s %s%s%s)",
+          (int)pgno,
+          (bWrite==0?"read-only":(bWrite>0?"read/write":"unknown")),
+          (zTab ? "index" : "table"),
+          (zTab ? zTab : ""), (zTab ? "." : ""), (zObj ? zObj : "UNKNOWN")
+      );
+    }
+  }
+
   sqlite3BtreeLeave(p);
   return rc;
 }

diff --git a/src/pager.c b/src/pager.c
index cbc078ffe6f923ac9b5130eed3655b7996959725..0ea9fc5d57ad05bae1ea2673c32f409c92fb66a9 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -4266,7 +4266,7 @@ static int syncJournal(Pager *pPager, int newHdr){
   assert( assert_pager_state(pPager) );
   assert( !pagerUseWal(pPager) );
 
-  rc = sqlite3PagerExclusiveLock(pPager, 0);
+  rc = sqlite3PagerExclusiveLock(pPager, 0, 0);
   if( rc!=SQLITE_OK ) return rc;
 
   if( !pPager->noSync ){
@@ -6347,7 +6347,7 @@ int sqlite3PagerSync(Pager *pPager, const char *zMaster){
 ** is returned. Otherwise, if some other error occurs (IO error, OOM etc.),
 ** and SQLite error code is returned.
 */
-int sqlite3PagerExclusiveLock(Pager *pPager, PgHdr *pPage1){
+int sqlite3PagerExclusiveLock(Pager *pPager, PgHdr *pPage1, Pgno *piConflict){
   int rc = pPager->errCode;
   assert( assert_pager_state(pPager) );
   if( rc==SQLITE_OK ){
@@ -6367,7 +6367,9 @@ int sqlite3PagerExclusiveLock(Pager *pPager, PgHdr *pPage1){
         ** invoke the busy-handler and try again for as long as it returns
         ** non-zero.  */
         do {
-          rc = sqlite3WalLockForCommit(pPager->pWal, pPage1, pPager->pAllRead);
+          rc = sqlite3WalLockForCommit(
+              pPager->pWal, pPage1, pPager->pAllRead, piConflict
+          );
         }while( rc==SQLITE_BUSY 
              && pPager->xBusyHandler(pPager->pBusyHandlerArg) 
         );

diff --git a/src/pager.h b/src/pager.h
index aa98bce95d4c9274ef30dba880ad568d7ec172c0..8aa17c4553ef7f2a333b08a387fe050985f09742 100644 (file)
--- a/src/pager.h
+++ b/src/pager.h
@@ -164,7 +164,7 @@ void *sqlite3PagerGetExtra(DbPage *);
 void sqlite3PagerPagecount(Pager*, int*);
 int sqlite3PagerBegin(Pager*, int exFlag, int);
 int sqlite3PagerCommitPhaseOne(Pager*,const char *zMaster, int);
-int sqlite3PagerExclusiveLock(Pager*, DbPage *pPage1);
+int sqlite3PagerExclusiveLock(Pager*, DbPage *pPage1, Pgno*);
 int sqlite3PagerSync(Pager *pPager, const char *zMaster);
 int sqlite3PagerCommitPhaseTwo(Pager*);
 int sqlite3PagerRollback(Pager*);

diff --git a/src/wal.c b/src/wal.c
index 4139b7c563af167a69246bb7e1fe27037abc0b43..13e1c57a99015afd9adcf2d9f49843866081ffab 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -243,7 +243,6 @@
 #ifndef SQLITE_OMIT_WAL
 
 #include "wal.h"
-#include "btreeInt.h"
 
 /*
 ** Trace output macros
@@ -2857,7 +2856,12 @@ static int walUpgradeReadlock(Wal *pWal){
 ** if an error (i.e. an OOM condition or IO error), an SQLite error code
 ** is returned.
 */
-int sqlite3WalLockForCommit(Wal *pWal, PgHdr *pPage1, Bitvec *pAllRead){
+int sqlite3WalLockForCommit(
+  Wal *pWal, 
+  PgHdr *pPage1, 
+  Bitvec *pAllRead, 
+  Pgno *piConflict
+){
   Pager *pPager = pPage1->pPager;
   int rc = walWriteLock(pWal);
 
@@ -2917,26 +2921,8 @@ int sqlite3WalLockForCommit(Wal *pWal, PgHdr *pPage1, Bitvec *pAllRead){
                 rc = SQLITE_BUSY_SNAPSHOT;
               }
             }else if( sqlite3BitvecTestNotNull(pAllRead, aPgno[i]) ){
-              PgHdr *pPg = 0;
-              rc = sqlite3PagerGet(pPage1->pPager, aPgno[i], &pPg, 0);
-              if( rc==SQLITE_OK ){
-                Pgno pgnoRoot = 0;
-                int bWrite = -1;
-                if( pPg ){
-                  pgnoRoot = ((MemPage*)sqlite3PagerGetExtra(pPg))->pgnoRoot;
-                  bWrite = sqlite3PagerIswriteable(pPg);
-                  sqlite3PagerUnref(pPg);
-                }
-                sqlite3_log(SQLITE_OK,
-                  "cannot commit CONCURRENT transaction "
-                  "- conflict at page %d "
-                  "(%s page; part of b-tree with root page %d)",
-                  (int)aPgno[i], 
-                  (bWrite==0?"read-only":(bWrite>0?"read/write":"unknown")),
-                  (int)pgnoRoot
-                );
-                rc = SQLITE_BUSY_SNAPSHOT;
-              }
+              *piConflict = aPgno[i];
+              rc = SQLITE_BUSY_SNAPSHOT;
             }else if( (pPg = sqlite3PagerLookup(pPager, aPgno[i])) ){
               /* Page aPgno[i], which is present in the pager cache, has been
               ** modified since the current CONCURRENT transaction was started.

diff --git a/src/wal.h b/src/wal.h
index b636d57a0aa6e0d2fd831bbb37bc794b6e514011..d1909c4621467438f162711813ed12e4ef43f7e8 100644 (file)
--- a/src/wal.h
+++ b/src/wal.h
@@ -136,7 +136,7 @@ int sqlite3WalSnapshotRecover(Wal *pWal);
 
 #ifndef SQLITE_OMIT_CONCURRENT
 /* Tell the wal layer that we want to commit a concurrent transaction */
-int sqlite3WalLockForCommit(Wal *pWal, PgHdr *pPg, Bitvec *pRead);
+int sqlite3WalLockForCommit(Wal *pWal, PgHdr *pPg, Bitvec *pRead, Pgno*);
 
 /* Upgrade the state of the client to take into account changes written
 ** by other connections */

diff --git a/test/concurrent5.test b/test/concurrent5.test
index e77c7940485b149e1d14dc642ab240d5c9788f72..dde661ea8bd03af099eaebbfd196273d8c0297e3 100644 (file)
--- a/test/concurrent5.test
+++ b/test/concurrent5.test
@@ -59,7 +59,7 @@ do_test 1.1.1 {
   catchsql COMMIT db2
 } {1 {database is locked}}
 do_test_conflict_msg 1.1.2 {
-  conflict at page 2 (read-only page; part of b-tree with root page 2)
+  conflict at page 2 (read-only page; part of db table t1)
 }
 
 do_test 1.2.1 {
@@ -78,7 +78,7 @@ do_test 1.2.1 {
 } {1 {database is locked}}
 
 do_test_conflict_msg 1.2.2 {
-  conflict at page 105 (read/write page; part of b-tree with root page 2)
+  conflict at page 105 (read/write page; part of db table t1)
 }
 
 do_test 1.3.1 {
@@ -97,7 +97,31 @@ do_test 1.3.1 {
 } {1 {database is locked}}
 
 do_test_conflict_msg 1.3.2 {
-  conflict at page 3 (read/write page; part of b-tree with root page 3)
+  conflict at page 3 (read/write page; part of db table t2)
+}
+
+do_test 1.4.1 {
+  set ::log [list]
+
+  execsql {
+    ROLLBACK;
+    CREATE TABLE t3(a INTEGER PRIMARY KEY, b INTEGER);
+    CREATE INDEX i3 ON t3(b);
+
+    WITH s(i) AS (
+      SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<5000
+    ) INSERT INTO t3 SELECT i, i FROM s;
+
+    BEGIN CONCURRENT;
+      INSERT INTO t3 VALUES(0, 5001);
+  } db2
+
+  execsql { INSERT INTO t3 VALUES(NULL, 5002) } db
+  catchsql COMMIT db2
+} {1 {database is locked}}
+
+do_test_conflict_msg 1.3.2 {
+  conflict at page 211 (read/write page; part of db index t3.i3)
 }
 
 db close