Remove unnecessary divergence from trunk.

FossilOrigin-Name: 019b04342861589cd3bf64006f30b682d8c778b685cefd071327acefba8e55b1

diff --git a/manifest b/manifest
index f3874e3873c1ae731e6d100ddb5a4c68bdaa7989..03501604a8aa4b98274c77f49259b7b38f89807f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sbegin-concurrent\sbranch.
-D 2024-12-16T11:19:00.567
+C Remove\sunnecessary\sdivergence\sfrom\strunk.
+D 2024-12-16T12:09:02.980
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -721,8 +721,8 @@ F src/auth.c 54ab9c6c5803b47c0d45b76ce27eff22a03b4b1f767c5945a3a4eb13aa4c78dc
 F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
 F src/bitvec.c 501daeef838fa82a9fb53540d72f29e3d9172c8867f1e19f94f681e2e20b966e
 F src/btmutex.c 79a43670447eacc651519a429f6ece9fd638563cf95b469d6891185ddae2b522
-F src/btree.c 9e32862e7369e8e5ee3f60f084cf40fb41cc1a8ba52a61093d08ecb3f941fd6c
-F src/btree.h df26089b055c4cffe243e5bc98edc729c4ad880bfeb8f229fd16248e4cec10ff
+F src/btree.c bf5db62990845b15fb98117418124de85bf1a664071278d958e8f27e5c516a50
+F src/btree.h 65b1b3e1d28c4e2f52a85aebdfb536508084cfe0f843fda3102cfdd4e23a209f
 F src/btreeInt.h 8efd30e75e35a3c6a1c4dad7410d4ddfcd560f5f46401b208fa79eceef34525a
 F src/build.c 196415a804a362dbae6d1939d6b8327d527fe08fb399834191e06d22a33a3aa4
 F src/callback.c db3a45e376deff6a16c0058163fe0ae2b73a2945f3f408ca32cf74960b28d490
@@ -770,7 +770,7 @@ F src/os_unix.c 24a82109b67c1771500c1f398eda0278d95f9c3bedc71d2cb1a48db39a56a787
 F src/os_win.c 49c7725b500f5867e8360e75eeb30f9d70b62fa1f05c8a101da627210578df32
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 4c8b569b6745efd0e2af57ac00b9a4c73451b8aa0ed51fedecbaa7523c1111bb
-F src/pager.h e2df6b92e0402bc8d516016f361da82758b7d7769ef1a18e2abeadece18103e0
+F src/pager.h 597ed34563ffa2588e37e556e2f0f9326f62492a459330ed3aaf6739f1e6a665
 F src/parse.y 5e6958ec69f538fe98f22dda2ace520eabcda314c651f48546ce72c8c0b4e221
 F src/pcache.c 588cc3c5ccaaadde689ed35ce5c5c891a1f7b1f4d1f56f6cf0143b74d8ee6484
 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
@@ -793,7 +793,7 @@ F src/status.c cb11f8589a6912af2da3bb1ec509a94dd8ef27df4d4c1a97e0bcf2309ece972b
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 F src/tclsqlite.c 90441d3cc16f966a23499d9096a3d2d971e5e8fddb4d1413b096b79c2b2cff07
 F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395
-F src/test1.c 9c64f39482d44bb82f610179256951140b6917e7a08712d3dd604d3a0757275a
+F src/test1.c 6d9f60d9cc68787429de46a9ef62e10c1460112bb6366ab6ca003a3a509f6bd3
 F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3
 F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b
 F src/test4.c 13e57ae7ec7a959ee180970aef09deed141252fe9bb07c61054f0dfa4f1dfd5d
@@ -863,7 +863,7 @@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf8
 F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
 F src/vtab.c 316cd48e9320660db3047cd306cd056e4361180cebb4d0f10a39244e10c11422
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-F src/wal.c 3f6502c1e35aafcc972d1fbc085e7d92e12073fd9cec1f45c47aeefdb94b9755
+F src/wal.c c6add778fbb08ff7c5ec3663595e49140ec4472895c748b48766fa2db8ddc7b3
 F src/wal.h e9aeb67102d9b9a0b089b80bd6136a16dd6360ac3daa731f2b71c6d4f8341717
 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
 F src/where.c 9ad3dea8003a8913da6a4ca8322e2fe30773f46e88a0d4fbf9db13bdb999efa2
@@ -2219,8 +2219,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 3823295299f7f834e0be1310083afd106ade84b87c27839e68c78676fc8982df ed5e912622839dce76dfb7352b56bb6fc698ecffde195f48db8d3339e9628cb5
-R e2daab5e54b7d69bb422accea922ede5
+P faef90eac3925341df958825d80466d737b478d4f0bdaead73f0e069770e923a
+R 1f747555ec6d9ac4f6898cf3a2eeefc2
 U drh
-Z 00ce49d8912aca64275b86cfbabf0e7a
+Z c36104dc4fc3746611f1b61b64c32712
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 2622d37433fb0a3575a0e7a048d44f04e9f0e4a1..9115f393e9095950f29a4d782b25d1fd4ad5c4d9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-faef90eac3925341df958825d80466d737b478d4f0bdaead73f0e069770e923a
+019b04342861589cd3bf64006f30b682d8c778b685cefd071327acefba8e55b1

diff --git a/src/btree.c b/src/btree.c
index e4e28c103388251e39dd93bf189f6497330eca22..43c72b7fe52b4e4dcb85fdbe421e7b1cf4624260 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -761,7 +761,7 @@ static void btreePtrmapCheck(BtShared *pBt, Pgno nPage){
 # define btreePtrmapCheck(y,z) 
 #endif /* SQLITE_OMIT_CONCURRENT */
 
-static void releasePage(MemPage *pPage);  /* Forward reference */
+static void releasePage(MemPage *pPage);         /* Forward reference */
 static void releasePageOne(MemPage *pPage);      /* Forward reference */
 static void releasePageNotNull(MemPage *pPage);  /* Forward reference */
 
@@ -4727,7 +4727,6 @@ int sqlite3BtreeCommitPhaseOne(Btree *p, const char *zSuperJrnl){
   if( p->inTrans==TRANS_WRITE ){
     BtShared *pBt = p->pBt;
     sqlite3BtreeEnter(p);
-
 #ifndef SQLITE_OMIT_AUTOVACUUM
     if( pBt->autoVacuum ){
       assert( ISCONCURRENT==0 );

diff --git a/src/btree.h b/src/btree.h
index e685d981f7bd5dc1b6c3512990c1ca0b5534bc04..7cd16a470cde17165fa64ccd9b5635e45e5df9db 100644 (file)
--- a/src/btree.h
+++ b/src/btree.h
@@ -422,4 +422,5 @@ void sqlite3BtreeClearCache(Btree*);
 # define sqlite3SchemaMutexHeld(X,Y,Z) 1
 #endif
 
+
 #endif /* SQLITE_BTREE_H */

diff --git a/src/pager.h b/src/pager.h
index 2cbe4545ae0885145df74b72c00d442e52e01b2b..609a04a955622e5879dc00db652250b6c4371c6f 100644 (file)
--- a/src/pager.h
+++ b/src/pager.h
@@ -171,7 +171,6 @@ int sqlite3PagerOpenSavepoint(Pager *pPager, int n);
 int sqlite3PagerSavepoint(Pager *pPager, int op, int iSavepoint);
 int sqlite3PagerSharedLock(Pager *pPager);
 
-
 #ifndef SQLITE_OMIT_WAL
   int sqlite3PagerCheckpoint(Pager *pPager, sqlite3*, int, int*, int*);
   int sqlite3PagerWalSupported(Pager *pPager);

diff --git a/src/test1.c b/src/test1.c
index a10230bc01f276a0e5d5d3f8f1e983ee2f9cc208..7057b2e4818dc369c40c1888e92bbd3b19e60246 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -9096,9 +9096,9 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
      { "sqlite3_snapshot_open_blob", test_snapshot_open_blob, 0 },
      { "sqlite3_snapshot_cmp_blob", test_snapshot_cmp_blob, 0 },
 #endif
-     { "sqlite3_delete_database", test_delete_database, 0 },
-     { "sqlite3_wal_info", test_wal_info, 0 },
-     { "atomic_batch_write",      test_atomic_batch_write,     0   },
+     { "sqlite3_delete_database", test_delete_database,    0 },
+     { "sqlite3_wal_info",        test_wal_info,           0 },
+     { "atomic_batch_write",      test_atomic_batch_write, 0 },
      { "sqlite3_mmap_warm",       test_mmap_warm,          0 },
      { "sqlite3_config_sorterref", test_config_sorterref,   0 },
      { "sqlite3_autovacuum_pages", test_autovacuum_pages,   0 },

diff --git a/src/wal.c b/src/wal.c
index ec57a8e8d60dfeec7d652f501935730eb6c5f248..be2d1991c0116abe34e466a6ae6786f27eac1abe 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -3521,7 +3521,8 @@ static int walFindFrame(
     return SQLITE_OK;
   }
 
-  /* Each iteration of the following for() loop searches one
+  /* Search the hash table or tables for an entry matching page number
+  ** pgno. Each iteration of the following for() loop searches one
   ** hash table (each hash table indexes up to HASHTABLE_NPAGE frames).
   **
   ** This code might run concurrently to the code in walIndexAppend()
@@ -3977,10 +3978,10 @@ int sqlite3WalUndo(
     Pgno iMax = pWal->hdr.mxFrame;
     Pgno iFrame;
 
-    /* Restore the clients cache of the wal-index header to the state it
-    ** was in before the client began writing to the database.
-    */
     SEH_TRY {
+      /* Restore the clients cache of the wal-index header to the state it
+      ** was in before the client began writing to the database.
+      */
       memcpy(&pWal->hdr, (void *)walIndexHdr(pWal), sizeof(WalIndexHdr));
 #ifndef SQLITE_OMIT_CONCURRENT
       if( bConcurrent ){
@@ -3989,7 +3990,6 @@ int sqlite3WalUndo(
 #else
       UNUSED_PARAMETER(bConcurrent);
 #endif
-  
       for(iFrame=pWal->hdr.mxFrame+1;
           ALWAYS(rc==SQLITE_OK) && iFrame<=iMax;
           iFrame++
@@ -4009,7 +4009,8 @@ int sqlite3WalUndo(
         rc = xUndo(pUndoCtx, walFramePgno(pWal, iFrame));
       }
       if( iMax!=pWal->hdr.mxFrame ) walCleanupHash(pWal);
-    } SEH_EXCEPT( rc = SQLITE_IOERR_IN_PAGE; )
+    }
+    SEH_EXCEPT( rc = SQLITE_IOERR_IN_PAGE; )
   }
   return rc;
 }
@@ -4372,7 +4373,6 @@ static int walFrames(
     p->flags |= PGHDR_WAL_APPEND;
   }
 
-
   /* Recalculate checksums within the wal file if required. */
   if( isCommit && pWal->iReCksum ){
     rc = walRewriteChecksums(pWal, iFrame);
@@ -4589,7 +4589,7 @@ int sqlite3WalCheckpoint(
       }else{
         rc = walCheckpoint(pWal, db, eMode2, xBusy2, pBusyArg, sync_flags, zBuf);
       }
-  
+
       /* If no error occurred, set the output variables. */
       if( rc==SQLITE_OK || rc==SQLITE_BUSY ){
         if( pnLog ) *pnLog = (int)pWal->hdr.mxFrame;