From: drh <drh@noemail.net>
Date: Mon, 12 Aug 2019 18:26:46 +0000 (+0000)
Subject: Make sure the btree cursor overflow cache is cleared when overwriting
X-Git-Tag: version-3.30.0~144
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=554a19dbeef3c45d5f52c540a79920403c54170a;p=thirdparty%2Fsqlite.git

Make sure the btree cursor overflow cache is cleared when overwriting
a cell in sqlite3BtreeInsert().  Ticket [3cf9bb227e9a5d32]

FossilOrigin-Name: 7dae7b969ed314605a3a2da2cfdce4d81152740f5d3bfbc2a6e311b13ee325a7
---

diff --git a/manifest b/manifest
index 89ec0e6944..138066f7d7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C For\sthe\s".testctrl\sprng_seed"\scommand\sin\sthe\sCLI,\sif\sthe\sargument\sis\s"random"\nthen\sselect\sa\srandom\sinteger\sseed\sand\sprint\sthe\sseed\svalue\son\sstdout.
-D 2019-08-12T16:25:11.731
+C Make\ssure\sthe\sbtree\scursor\soverflow\scache\sis\scleared\swhen\soverwriting\na\scell\sin\ssqlite3BtreeInsert().\s\sTicket\s[3cf9bb227e9a5d32]
+D 2019-08-12T18:26:46.324
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -464,7 +464,7 @@ F src/auth.c a3d5bfdba83d25abed1013a8c7a5f204e2e29b0c25242a56bc02bb0c07bf1e06
 F src/backup.c f70077d40c08b7787bfe934e4d1da8030cb0cc57d46b345fba2294b7d1be23ab
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 781e4594098dca97db672e52ed17c7f063b5b65db144c0c1bf1e9818e7be1ad4
+F src/btree.c 6061323b98cc794a1e3ad6907f683f1ad2b8c48d7c7d486072b21f18efe73761
 F src/btree.h c11446f07ec0e9dc85af8041cb0855c52f5359c8b2a43e47e02a685282504d89
 F src/btreeInt.h 6111c15868b90669f79081039d19e7ea8674013f907710baa3c814dc3f8bfd3f
 F src/build.c 7fb6ad35d162517d6bfa196f4fb2a1d7c3a362531e84c59f3a0479e0de511556
@@ -1056,7 +1056,7 @@ F test/indexexpr1.test 0f293369ed6f56764cfc3db05685d45469d9e685ba87e3698527049ba
 F test/indexexpr2.test d319e7d1b1043403f39a20c892d512e02b5549c6004806b977030f2430c60208
 F test/indexfault.test 98d78a8ff1f5335628b62f886a1cb7c7dac1ef6d48fa39c51ec871c87dce9811
 F test/init.test 15c823093fdabbf7b531fe22cf037134d09587a7
-F test/insert.test 9773604f8e1a2595f51488a5643c359d8a11dc55a11cb185910d93387d378458
+F test/insert.test 72004f6a900a25bd3f1ce9a72e73d02749644666a8ce6d6d2dba061137e5aa63
 F test/insert2.test 4d14b8f1b810a41995f6286b64a6943215d52208
 F test/insert3.test 1b7db95a03ad9c5013fdf7d6722b6cd66ee55e30
 F test/insert4.test 7802ada6ba8738661b9f6c0e26858d3375b40cc7180289fd350644cd7a08fec9
@@ -1836,7 +1836,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 48d9b48ab4ace234eb1a055cf33cb533a1c3aa82d0a6e086d96226bd9474ceca
-R 5a141faa1c39cc955778f126f1aabd0f
+P 636ca4472c9f41eb3989f28854d4968867837399a2092f389d1b814d98cccbae
+R 35de1073023e10ac023f683a008bdac4
 U drh
-Z 779c2cf81842090ecdd5432af318ddb5
+Z 4e3a468c24aea8e9967dfc838bb1156b
diff --git a/manifest.uuid b/manifest.uuid
index 74af8f947f..187033b4b5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-636ca4472c9f41eb3989f28854d4968867837399a2092f389d1b814d98cccbae
\ No newline at end of file
+7dae7b969ed314605a3a2da2cfdce4d81152740f5d3bfbc2a6e311b13ee325a7
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 30cd0d128c..932ce04359 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -8716,6 +8716,8 @@ int sqlite3BtreeInsert(
       memcpy(newCell, oldCell, 4);
     }
     rc = clearCell(pPage, oldCell, &info);
+    testcase( pCur->curFlags & BTCF_ValidOvfl );
+    invalidateOverflowCache(pCur);
     if( info.nSize==szNew && info.nLocal==info.nPayload 
      && (!ISAUTOVACUUM || szNew<pPage->minLocal)
     ){
diff --git a/test/insert.test b/test/insert.test
index 01c7016d84..397a0e6ff9 100644
--- a/test/insert.test
+++ b/test/insert.test
@@ -460,4 +460,20 @@ do_execsql_test insert-14.1 {
 
 integrity_check insert-99.0
 
+# 2019-08-12.
+#
+do_execsql_test insert-15.1 {
+  DROP TABLE IF EXISTS t1;
+  DROP TABLE IF EXISTS t2;
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b TEXT);
+  CREATE INDEX i1 ON t1(b);
+  CREATE TABLE t2(a, b);
+  INSERT INTO t2 VALUES(4, randomblob(31000));
+  INSERT INTO t2 VALUES(4, randomblob(32000));
+  INSERT INTO t2 VALUES(4, randomblob(33000));
+  REPLACE INTO t1 SELECT a, b FROM t2;
+  SELECT a, length(b) FROM t1;
+} {4 33000}
+
+
 finish_test