Fix the fts3/4 integrity-check command so that it works with "ORDER=DESC" tables...

FossilOrigin-Name: 5863546df99abd1ad4ebcaba18dec647be4368e2c13ce0b28e48c8608d3e87ef

diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index f0e935ca8ec7172da4a9684eba8fbd702cefb7e2..058677774dab9e264f8c241c612a0dab533fac07 100644 (file)
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -5171,7 +5171,11 @@ static u64 fts3ChecksumIndex(
               pCsr += sqlite3Fts3GetVarint(pCsr, &iCol);
             }else{
               pCsr += sqlite3Fts3GetVarint(pCsr, &iVal);
-              iDocid += iVal;
+              if( p->bDescIdx ){
+                iDocid -= iVal;
+              }else{
+                iDocid += iVal;
+              }
             }
           }else{
             iPos += (iVal - 2);

diff --git a/manifest b/manifest
index c451a635c25b50d6a0e9002a4f890e92517e5a74..5d40462300d4521aaca13bce09c8b6f7f7b46534 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\sversion\snumber\sto\s3.31.0\sfor\sthe\snext\srelease\scycle.
-D 2019-10-11T14:25:00.543
+C Fix\sthe\sfts3/4\sintegrity-check\scommand\sso\sthat\sit\sworks\swith\s"ORDER=DESC"\stables.\sFix\sfor\s[8a6fa2bb].
+D 2019-10-11T14:27:17.413
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -99,7 +99,7 @@ F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3
 F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
 F ext/fts3/fts3_unicode.c 4b9af6151c29b35ed09574937083cece7c31e911f69615e168a39677569b684d
 F ext/fts3/fts3_unicode2.c 416eb7e1e81142703520d284b768ca2751d40e31fa912cae24ba74860532bf0f
-F ext/fts3/fts3_write.c 9b5ae495b3bf287aab3d92268b6fdc4eb68dd6d8c0342a0b316cf3157953a3f7
+F ext/fts3/fts3_write.c 2fd47cef0eb10ac977ea49be4ab4113b22fed59ddef184f0e01a76ee9c3c8d10
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
 F ext/fts3/tool/fts3cov.sh c331d006359456cf6f8f953e37f2b9c7d568f3863f00bb5f7eb87fea4ac01b73
@@ -958,7 +958,7 @@ F test/fts3fuzz001.test e3c7b0ce9b04cc02281dcc96812a277f02df03cd7dc082055d87e11e
 F test/fts3join.test 949b4f5ae3ae9cc2423cb865d711e32476bdb205ab2be923fdf48246e4a44166
 F test/fts3malloc.test b0e4c133b8d61d4f6d112d8110f8320e9e453ef6
 F test/fts3matchinfo.test aa66cc50615578b30f6df9984819ae5b702511cf8a94251ec7c594096a703a4a
-F test/fts3misc.test 889f51b669e083b96a79a2045ff9baa212071ac1a5eb0e06979c63af3f3451f2
+F test/fts3misc.test 67bf293709e1a509a019a9192a5a5752b5384ac344ba0713e95af9fe22a027b5
 F test/fts3near.test 7e3354d46f155a822b59c0e957fd2a70c1d7e905
 F test/fts3offsets.test b85fd382abdc78ebce721d8117bd552dfb75094c
 F test/fts3prefix.test fa794eaab0bdae466494947b0b153d7844478ab2
@@ -1846,7 +1846,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 bf875dc59909f9c22f7c1fc843bc4d9e5d97af5cb4ef43c4fa1d566ddfdeaacb
-R a5c987ad61c2393e0885d5bb61727fe1
-U drh
-Z cfe6e6f280cfd169c3139ebab07a317c
+P ffd4c30620abe6ba38d82f3db934d18cc8468aaac4cd50a4e01be8910854d3f0
+R 9cbaf6d312ff6a805740af8711137a3b
+U dan
+Z 3644422e42869279e7f1f288a5bed267

diff --git a/manifest.uuid b/manifest.uuid
index 8c6a71967ddcbc575045c6fe9e4795811c952217..c1180633170fe8e55f72dbe8a90132605cf913d8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ffd4c30620abe6ba38d82f3db934d18cc8468aaac4cd50a4e01be8910854d3f0
\ No newline at end of file
+5863546df99abd1ad4ebcaba18dec647be4368e2c13ce0b28e48c8608d3e87ef
\ No newline at end of file

diff --git a/test/fts3misc.test b/test/fts3misc.test
index 7f679d23f4a678f7acfcf8535f709dd7b078eafb..19d07edaf7b07e0559fa18f40f05a6ee4c353bf9 100644 (file)
--- a/test/fts3misc.test
+++ b/test/fts3misc.test
@@ -237,5 +237,35 @@ do_execsql_test 7.1 {
   INSERT INTO vt0(vt0) VALUES('integrity-check');
 }
 
+#-------------------------------------------------------------------------
+#
+reset_db
+do_execsql_test 7.0.1 {
+  CREATE VIRTUAL TABLE vt0 USING fts4(c0, order=DESC);
+  INSERT INTO vt0(c0) VALUES (0), (0);
+}
+do_execsql_test 7.0.2 {
+  INSERT INTO vt0(vt0) VALUES('integrity-check');
+}
+reset_db
+do_execsql_test 7.1.1 {
+  CREATE VIRTUAL TABLE vt0 USING fts4(c0, order=ASC);
+  INSERT INTO vt0(c0) VALUES (0), (0);
+}
+do_execsql_test 7.1.2 {
+  INSERT INTO vt0(vt0) VALUES('integrity-check');
+}
+
+do_execsql_test 7.2.1 {
+  CREATE VIRTUAL TABLE ft USING fts4(c0, c1, order=DESC, prefix=1);
+  INSERT INTO ft VALUES('a b c d', 'hello world');
+  INSERT INTO ft VALUES('negative', 'positive');
+  INSERT INTO ft VALUES('hello world', 'a b c d');
+}
+do_execsql_test 7.2.2 {
+  INSERT INTO vt0(vt0) VALUES('integrity-check');
+}
+
+
 
 finish_test