From: drh <drh@noemail.net>
Date: Thu, 3 May 2018 12:57:48 +0000 (+0000)
Subject: Bug fixes in the overwrite optimization.
X-Git-Tag: version-3.24.0~61^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b03192e15b45ac1d448b958be6d35d1ea9cf9ff;p=thirdparty%2Fsqlite.git

Bug fixes in the overwrite optimization.

FossilOrigin-Name: 0cb6cd2a6a596afaa1cca6c5f5abc2ea75d04f254c7debaf36ecd6a90b66aed6
---

diff --git a/manifest b/manifest
index 734d14e6c0..210a679733 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\ssqlite3BtreeInsert()\sroutine\stries\sto\soverwrite\san\sexisting\scell\swith\nmodified\scontent\sif\sthe\snew\scontent\sis\sthe\ssame\ssize.\s\sPages\sare\sonly\sdirtied\nif\sthey\schange.\s\sThis\sprototype\sworks\ssome,\sbut\sstill\shas\sissues.
-D 2018-05-03T03:59:02.523
+C Bug\sfixes\sin\sthe\soverwrite\soptimization.
+D 2018-05-03T12:57:48.671
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439
@@ -434,7 +434,7 @@ F src/auth.c 6277d63837357549fe14e723490d6dc1a38768d71c795c5eb5c0f8a99f918f73
 F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c d1b1bd0602381cd668fefdc21bb376083d34a202c7f978ddd6cdfe8b576880fa
+F src/btree.c 7216dac5e870868de7429e71727fb87cca8057fd01814c18df2e59a5d00d20d5
 F src/btree.h 0866c0a08255142ea0e754aabd211c843cab32045c978a592a43152405ed0c84
 F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
 F src/build.c 0c2be5839f22aa2938f217c6c6c2120d9fc96872a546a37541a8271541cb355e
@@ -1727,10 +1727,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 ab0d99d0b5edece4c639baa47ce1ca2c02774cb2515e5b7f36d9bd312ccd3310
-R d19653c30e874527a8180a99ea6a4aad
-T *branch * cell-overwrite-prototype
-T *sym-cell-overwrite-prototype *
-T -sym-trunk *
+P 489451b378819621537231c1c8a07704437e11c1f5384fd53b09f3977d2213a4
+R b89660c58e0d48e704d46836e0da0214
 U drh
-Z 4db008fe8cce4e65f98c2fd1a101b30c
+Z 41261a1ee8ebfd1f0c3b6e3f166f7f4d
diff --git a/manifest.uuid b/manifest.uuid
index 44cef5c9c1..88b683be02 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-489451b378819621537231c1c8a07704437e11c1f5384fd53b09f3977d2213a4
\ No newline at end of file
+0cb6cd2a6a596afaa1cca6c5f5abc2ea75d04f254c7debaf36ecd6a90b66aed6
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 0a8c172212..e920d89026 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -8215,12 +8215,12 @@ static int btreeOverwriteCell(BtCursor *pCur, const BtreePayload *pX){
   do{
     rc = btreeGetPage(pBt, ovflPgno, &pPage, 0);
     if( rc ) return rc;
-    if( iOffset+ovflPageSize>nTotal ){
-      ovflPgno = get4byte(pPage->aData + ovflPageSize);
+    if( iOffset+ovflPageSize<nTotal ){
+      ovflPgno = get4byte(pPage->aData);
     }else{
       ovflPageSize = nTotal - iOffset;
     }
-    rc = btreeOverwriteContent(pPage, pPage->aData, pX,
+    rc = btreeOverwriteContent(pPage, pPage->aData+4, pX,
                                iOffset, ovflPageSize);
     if( rc ) return rc;
     iOffset += ovflPageSize;