Ensure that multiple updates of the same FTS4 row (i.e. the row with the same

rowid) within a single transaction are written to separate segments. Fix for
[d6ec09ec].

FossilOrigin-Name: d2a81a3752a8298ee65fddcf32dee2147ba6467f770315a41966b3533977aa64

diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index 5bca766c201a6b105b636b66277b1d90d4d0f1be..792a498a6f7e8987e2f933c3b0b3c3f415877fa7 100644 (file)
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -5639,7 +5639,7 @@ int sqlite3Fts3UpdateMethod(
         rc = FTS_CORRUPT_VTAB;
       }
     }
-    if( rc==SQLITE_OK && (!isRemove || *pRowid!=p->iPrevDocid ) ){
+    if( rc==SQLITE_OK ){
       rc = fts3PendingTermsDocid(p, 0, iLangid, *pRowid);
     }
     if( rc==SQLITE_OK ){

diff --git a/manifest b/manifest
index 240d519aa1a8407a2621a7f88711b8538eba9c3f..ecd5e1242b201f6193e8aab42cfeb2393af78c62 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Updates\sto\sthe\sspeed-check.sh\sscript\sfor\simprovements\sto\sthe\s--vdbeprofile\noption.
-D 2018-02-12T20:50:28.825
+C Ensure\sthat\smultiple\supdates\sof\sthe\ssame\sFTS4\srow\s(i.e.\sthe\srow\swith\sthe\ssame\nrowid)\swithin\sa\ssingle\stransaction\sare\swritten\sto\sseparate\ssegments.\sFix\sfor\n[d6ec09ec].
+D 2018-02-13T16:21:32.960
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7a3f714b4fcf793108042b7b0a5c720b0b310ec84314d61ba7f3f49f27e550ea
@@ -96,7 +96,7 @@ F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3
 F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
 F ext/fts3/fts3_unicode.c 525a3bd9a7564603c5c061b7de55403a565307758a94600e8a2f6b00d1c40d9d
 F ext/fts3/fts3_unicode2.c cc04fc672bfd42b1e650398cb0bf71f64f9aae032cfe75bbcfe75b9cf966029c
-F ext/fts3/fts3_write.c 7a7cf93c02ebe0ee4211e4aa07da77586c2dcf7d381c1382f81d29c9aa8cae8c
+F ext/fts3/fts3_write.c 434fe5eaf6b848e9fa18dd269ab2450732f776ffb4d8051cfd0eef2c510ec5da
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
 F ext/fts3/tool/fts3cov.sh c331d006359456cf6f8f953e37f2b9c7d568f3863f00bb5f7eb87fea4ac01b73
@@ -918,7 +918,7 @@ F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891
 F test/fts4merge3.test 8d9ccb4a3d41c4c617a149d6c4b13ad02de797d0
 F test/fts4merge4.test d895b1057a7798b67e03455d0fa50e9ea836c47b
 F test/fts4noti.test 5553d7bb2e20bf4a06b23e849352efc022ce6309
-F test/fts4onepass.test 7319d61a2ed1325fc54afd0c060a0513b462303a
+F test/fts4onepass.test d69ddc4ee3415e40b0c5d1d0408488a87614d4f63ba9c44f3e52db541d6b7cc7
 F test/fts4opt.test fd6a11684b965e1999564ae763797b7fb9e34c96
 F test/fts4unicode.test ceca76422abc251818cb25dabe33d3c3970da5f7c90e1540f190824e6b3a7c95
 F test/full.test 6b3c8fb43c6beab6b95438c1675374b95fab245d
@@ -1705,7 +1705,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 d44d5936428859b6d3e089d9835acb8ca1f3c0a85b59eeaa619170623e7dcc30
-R ed478e21f56ba8798873dd31125e1435
-U drh
-Z b17fd438653dec89029ec54019e16fa1
+P f89c8f8ecd67f72ee730a2a334dff69b406a3dd00f50abbb54c4dc86cfab1bd1
+R 6201bc04be1c8ea59cb7f6218616fce1
+U dan
+Z a105e3a27f3cee541040c34c5a8f6a03

diff --git a/manifest.uuid b/manifest.uuid
index a9e9aba772af48f0f3f21e4f09cf51855278af98..a809b05e7202355987a84fbecd118b78d3934c60 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f89c8f8ecd67f72ee730a2a334dff69b406a3dd00f50abbb54c4dc86cfab1bd1
\ No newline at end of file
+d2a81a3752a8298ee65fddcf32dee2147ba6467f770315a41966b3533977aa64
\ No newline at end of file

diff --git a/test/fts4onepass.test b/test/fts4onepass.test
index 46cb4b794b09d9b81fce2d8c9d134e4d5ce20d14..344be4b1df1ffc952437ac7f08b7eff33b4059b8 100644 (file)
--- a/test/fts4onepass.test
+++ b/test/fts4onepass.test
@@ -143,4 +143,18 @@ foreach {tn tcl1 tcl2}  {
   eval $tcl2
 }
 
+do_execsql_test 4.0 {
+  CREATE VIRTUAL TABLE zt USING fts4(a, b);
+  INSERT INTO zt(rowid, a, b) VALUES(1, 'unus duo', NULL);
+  INSERT INTO zt(rowid, a, b) VALUES(2, NULL, NULL);
+
+  BEGIN;
+    UPDATE zt SET b='septum' WHERE rowid = 1;
+    UPDATE zt SET b='octo' WHERE rowid = 1;
+  COMMIT;
+
+  SELECT count(*) FROM zt_segdir;
+} {3}
+
+
 finish_test