Fix a bug in fts4 to do with matchinfo and deferred tokens.

FossilOrigin-Name: 30d42dc66f19ef5cc5b27d6273eadf56619a3ce8

diff --git a/ext/fts3/fts3_snippet.c b/ext/fts3/fts3_snippet.c
index 54371db1c8d8311592446731d3100fd6a3d00e26..6b74535079209caeb91acf67d5a2669b0f36cc9a 100644 (file)
--- a/ext/fts3/fts3_snippet.c
+++ b/ext/fts3/fts3_snippet.c
@@ -880,13 +880,13 @@ static int fts3ExprLocalHitsCb(
   void *pCtx                      /* Pointer to MatchInfo structure */
 ){
   MatchInfo *p = (MatchInfo *)pCtx;
+  int iStart = iPhrase * p->nCol * 3;
+  int i;
+
+  for(i=0; i<p->nCol; i++) p->aMatchinfo[iStart+i*3] = 0;
 
   if( pExpr->aDoclist ){
     char *pCsr;
-    int iStart = iPhrase * p->nCol * 3;
-    int i;
-
-    for(i=0; i<p->nCol; i++) p->aMatchinfo[iStart+i*3] = 0;
 
     pCsr = sqlite3Fts3FindPositions(pExpr, p->pCursor->iPrevId, -1);
     if( pCsr ){

diff --git a/manifest b/manifest
index 04ac2cbb627b39bfc4da2f86cfcc99f919362407..4ecb663b1edd4d44496ee0862e69f71185a1ccab 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C In\sthe\sshell,\smake\ssure\sthe\s".log"\scommand\shas\sat\sleast\sone\sargument.
-D 2011-03-23T11:16:22.642
+C Fix\sa\sbug\sin\sfts4\sto\sdo\swith\smatchinfo\sand\sdeferred\stokens.
+D 2011-03-23T17:10:44
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -73,7 +70,7 @@ F ext/fts3/fts3_hash.c 3c8f6387a4a7f5305588b203fa7c887d753e1f1c
 F ext/fts3/fts3_hash.h 8331fb2206c609f9fc4c4735b9ab5ad6137c88ec
 F ext/fts3/fts3_icu.c ac494aed69835008185299315403044664bda295
 F ext/fts3/fts3_porter.c d61cfd81fb0fd8fbcb25adcaee0ba671aefaa5c2
-F ext/fts3/fts3_snippet.c bfefb42b5debf8725a30fd5122572aaeedc99397
+F ext/fts3/fts3_snippet.c e857c6a89d81d3b89df59f3b44b35c68d8ed5c62
 F ext/fts3/fts3_tokenizer.c 055f3dc7369585350b28db1ee0f3b214dca6724d
 F ext/fts3/fts3_tokenizer.h 13ffd9fcb397fec32a05ef5cd9e0fa659bf3dbd3
 F ext/fts3/fts3_tokenizer1.c 6e5cbaa588924ac578263a598e4fb9f5c9bb179d
@@ -455,7 +452,7 @@ F test/fts3corrupt2.test 6d96efae2f8a6af3eeaf283aba437e6d0e5447ba
 F test/fts3cov.test e0fb00d8b715ddae4a94c305992dfc3ef70353d7
 F test/fts3d.test 95fb3c862cbc4297c93fceb9a635543744e9ef52
 F test/fts3defer.test d6cb0db9b5997ecf863d96ff419f83f8f2c87f4f
-F test/fts3defer2.test da840efaedebfdd54293d04b36098e2d9872caa6
+F test/fts3defer2.test 288bef6de15557319b8c12d476ebdc83688ef96c
 F test/fts3e.test 1f6c6ac9cc8b772ca256e6b22aaeed50c9350851
 F test/fts3expr.test 5e745b2b6348499d9ef8d59015de3182072c564c
 F test/fts3expr2.test 18da930352e5693eaa163a3eacf96233b7290d1a
@@ -918,14 +915,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 0b7668a71ef8995ea0306c7d890f87761961426e
-R 88a09b7469ff1146f51987afec7567e4
-U drh
-Z f1bfc5b8226ce4dbe953fcf48ca565ea
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFNidaJoxKgR168RlERApqOAJwNgpXn213VO6fr+LnJXQLkyKs6wACePFP8
-pc1Sc0TC4VKU22K9u5+NaOQ=
-=M8WR
------END PGP SIGNATURE-----
+P 1ed5e361ca7bfa9226fec265704394e0f228f0c5
+R 2f8b1c68ec4ce4809965697dec333ba6
+U dan
+Z 998dcc0bc86840532e7dbf16c79e79d3

diff --git a/manifest.uuid b/manifest.uuid
index 1e4ab125fd74fbc6e3f2ce365a98f2fb6a47183d..107f784eee881741fd6d5f99923d326bc9b1e93f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1ed5e361ca7bfa9226fec265704394e0f228f0c5
\ No newline at end of file
+30d42dc66f19ef5cc5b27d6273eadf56619a3ce8
\ No newline at end of file

diff --git a/test/fts3defer2.test b/test/fts3defer2.test
index 142c92a9dd68bf095dd61f67f34634e79ce8a9d9..844180330042945198c7a231b473bb54fc6beea2 100644 (file)
--- a/test/fts3defer2.test
+++ b/test/fts3defer2.test
@@ -80,7 +80,7 @@ do_execsql_test 2.1.2 "INSERT INTO t2 VALUES('[string repeat {a } 10000]')"
 do_execsql_test 2.1.3 "INSERT INTO t2 VALUES('b [string repeat {z } 10000]')"
 do_execsql_test 2.1.4 [string repeat "INSERT INTO t2 VALUES('x');" 50]
 do_execsql_test 2.1.5 {
-  INSERT INTO t2 VALUES('a b c d e f g');
+  INSERT INTO t2 VALUES('a b c d e f g z');
   INSERT INTO t2 VALUES('a b c d e f g');
 }
 foreach {tn sql} {
@@ -92,12 +92,21 @@ foreach {tn sql} {
 } {
   execsql $sql
 
-  do_execsql_test 2.2.$tn {
+  do_execsql_test 2.2.$tn.1 {
     SELECT mit(matchinfo(t2, 'pcxnal')) FROM t2 WHERE t2 MATCH 'a b';
   } [list                                          \
+    [list 2 1  1 54 54  1 3 3  54 372 8]        \
     [list 2 1  1 54 54  1 3 3  54 372 7]        \
-    [list 2 1  1 54 54  1 3 3  54 372 7]        \
   ]
+
+  set sqlite_fts3_enable_parentheses 1
+  do_execsql_test 2.2.$tn.2 {
+    SELECT mit(matchinfo(t2, 'x')) FROM t2 WHERE t2 MATCH 'g OR (g z)';
+  } [list                                       \
+    [list 1 2 2  1 2 2   1 54 54]               \
+    [list 1 2 2  1 2 2   0 54 54]               \
+  ]
+  set sqlite_fts3_enable_parentheses 0
 }
 
 do_execsql_test 2.3.1 {