Fix a problem causing a cursor to retain an out-of-date cell-info cache when processi...

FossilOrigin-Name: b02811847cbb9c80ba886d3e84fc6a8048cde5c932405f50416baf6e0cbd78e9

diff --git a/manifest b/manifest
index 931ff035fdb734ff4cac133fc911fc518145cf8d..0667806fca0f2a97e942e3c418bc112c0ab70ee2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sproblems\swith\sthe\ssqlite3_error_offset()\sfunction\sand\sits\suse\sin\sthe\sCLI.
-D 2023-03-20T01:59:58.610
+C Fix\sa\sproblem\scausing\sa\scursor\sto\sretain\san\sout-of-date\scell-info\scache\swhen\sprocessing\sa\sDISTINCT\squery\son\svalues\sthat\sare\sidentical\saccording\sto\stheir\scollation\ssequence,\sbut\sdifferent\son\sdisk.
+D 2023-03-20T15:50:40.868
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -560,7 +560,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
-F src/btree.c 3b86f65f059059672df77c790e54adcb1091a2b9f72c604d0bbb9bca1472ad18
+F src/btree.c 0621c72ab215588f649d6f4466c6212d5b3ee3283eb4aa00d89e202cd5951bea
 F src/btree.h aa354b9bad4120af71e214666b35132712b8f2ec11869cb2315c52c81fad45cc
 F src/btreeInt.h 06bb2c1a07172d5a1cd27a2a5d617b93b1e976c5873709c31964786f86365a6e
 F src/build.c 8357d6ca9a8c9afc297c431df28bc2af407b47f3ef2311875276c944b30c4d54
@@ -934,7 +934,7 @@ F test/descidx2.test a0ba347037ff3b811f4c6ceca5fd0f9d5d72e74e59f2d9de346a9d2f6ad
 F test/descidx3.test 953c831df7ea219c73826dfbf2f6ee02d95040725aa88ccb4fa43d1a1999b926
 F test/diskfull.test 106391384780753ea6896b7b4f005d10e9866b6e
 F test/distinct.test 691c9e850b0d0b56b66e7e235453198cb4cf0760e324b7403d3c5abbeab0a014
-F test/distinct2.test cd1d15a4a2abf579298f7161e821ed50c0119136fe0424db85c52cf0adc230d1
+F test/distinct2.test bb71cc7b5e58e895787f9910a788c254f679928d324732d063fe9bc202ecbe71
 F test/distinctagg.test 14ec5026e684eddd414c61c08692b43773e224ac92efbed6ec08c6994bc39723
 F test/e_blobbytes.test 4c01dfe4f12087b92b20705a3fdfded45dc4ed16d5a211fed4e1d2786ba68a52
 F test/e_blobclose.test 692fc02a058476c2222a63d97e3f3b2b809c1842e5525ded7f854d540ac2e075
@@ -2045,11 +2045,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 824611ad33011bda676ce6c9c3cb2b46442fc0a48c458bdc86dd960623c1e945
-Q +26adbb80f51b9219ab2a3593496458b74a567ba5ee46b5154f056e389cfc09f7
-Q +2adb4e0dda471ffc9b2a5cbad01b6c2bc6091b7526a8c8b19944cb2d4a5111e7
-Q +770b3e67c89ca16b08a9234acb626917a26ea414b3bc0340f9601644cb7504f2
-R aeef81675f3fb54c932508006829679b
+P d5cd6c885b71b0939f5832fbb63bf800ae03dbbc2dc0f7beab1270133d414c54
+Q +1b3abc1daeac29714256b5a1d5a07a75dc986f1089054a8bee44a00583b7383a
+R fa66c1ca464a0878b0d78bf784d15014
 U drh
-Z f84ff922d2e574df5444162ab60906d4
+Z a48ca77dbf14e8cb5797e2b61f34219c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 77753e4c7baa73548ee802c8713452055ce4903a..e8d2c88e459086123c5cd361a9483350a5f6249c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d5cd6c885b71b0939f5832fbb63bf800ae03dbbc2dc0f7beab1270133d414c54
\ No newline at end of file
+b02811847cbb9c80ba886d3e84fc6a8048cde5c932405f50416baf6e0cbd78e9
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 6e08bedca74cef212b16a0c0f53889ad8d75f409..3de1a0a500473fbe4041ba6fd8c7a1764c378edb 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9213,6 +9213,7 @@ int sqlite3BtreeInsert(
   assert( szNew==pPage->xCellSize(pPage, newCell) );
   assert( szNew <= MX_CELL_SIZE(p->pBt) );
   idx = pCur->ix;
+  pCur->info.nSize = 0;
   if( loc==0 ){
     CellInfo info;
     assert( idx>=0 );
@@ -9285,7 +9286,6 @@ int sqlite3BtreeInsert(
   ** larger than the largest existing key, it is possible to insert the
   ** row without seeking the cursor. This can be a big performance boost.
   */
-  pCur->info.nSize = 0;
   if( pPage->nOverflow ){
     assert( rc==SQLITE_OK );
     pCur->curFlags &= ~(BTCF_ValidNKey);

diff --git a/test/distinct2.test b/test/distinct2.test
index 46eace6f0f385d932ddbafa519a0f1ee5e4d5108..958d9634fd6605c8b14ba71c52927ed2fdc3af8b 100644 (file)
--- a/test/distinct2.test
+++ b/test/distinct2.test
@@ -301,4 +301,16 @@ do_execsql_test 3030 {
   {} 1 a
 }
 
+#-------------------------------------------------------------------------
+#
+reset_db
+
+do_execsql_test 4010 {
+  CREATE TABLE t1(a, b COLLATE RTRIM);
+  INSERT INTO t1 VALUES(1, ''), (2, ' '), (3, '  ');
+}
+do_execsql_test 4020 {
+  SELECT b FROM t1 UNION SELECT 1;
+} {1 {  }}
+
 finish_test