Add test for matchinfo when a phrase includes some common tokens.

FossilOrigin-Name: 80a54ebc41e4224ab93d92cb390524db1c398155

diff --git a/manifest b/manifest
index aa200eab43cf278fb3e757b8f22c390646113022..35951964fe5951cf365658b0aae885dbba421b79 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sfor\sthe\smatchinfo()\sfunction\srelated\sto\sFTS4\scommon\stoken\shandling.
-D 2010-10-23T19:07:30
+C Add\stest\sfor\smatchinfo\swhen\sa\sphrase\sincludes\ssome\scommon\stokens.
+D 2010-10-25T09:01:57
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2c8cefd962eca0147132c7cf9eaa4bb24c656f3f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -434,7 +434,7 @@ F test/fts3c.test fc723a9cf10b397fdfc2b32e73c53c8b1ec02958
 F test/fts3cov.test 54cf1f98c72abee246447cd688590898c9ecbaf7
 F test/fts3d.test 95fb3c862cbc4297c93fceb9a635543744e9ef52
 F test/fts3defer.test cf66bf69afcc2fb8373d3aed31c55399409e83f2
-F test/fts3defer2.test acd2fdd4db0a3b7f0ce6b1b3154c9521cb62d27d
+F test/fts3defer2.test 1a9f213ca79509b60d81460febc7e4e5b64af95c
 F test/fts3e.test 1f6c6ac9cc8b772ca256e6b22aaeed50c9350851
 F test/fts3expr.test 5e745b2b6348499d9ef8d59015de3182072c564c
 F test/fts3expr2.test 18da930352e5693eaa163a3eacf96233b7290d1a
@@ -570,7 +570,7 @@ F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
 F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
 F test/pcache.test 4118a183908ecaed343a06fcef3ba82e87e0129d
 F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
-F test/permutations.test ec9b2ebd52ff43c5a3bec4723098fab1ef29d944
+F test/permutations.test e134e3383425bec6ef14438bff8c2c34248bff9e
 F test/pragma.test fdfc09067ea104a0c247a1a79d8093b56656f850
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
@@ -876,7 +876,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 5a4d5bfcaeb78a81713f138b01c0ea45a15c4d6c
-R eb3b2e3c665e63f01c554e4a5a259aeb
+P deb80eac9112d21835dfd3cee08ed8f09d975bf7
+R a3866e5a9d1a2e794f6f1ae62b6efaeb
 U dan
-Z f37bf8cb2dd9e3f74310b44a4142ec1c
+Z 940f99ae4559dd7b55d33211cd923bc7

diff --git a/manifest.uuid b/manifest.uuid
index 185975bf9491e6a83a42c3520242c59ebb16b259..485ecba4a7d296a0143cb28cb7c473fa5f4c3cc6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-deb80eac9112d21835dfd3cee08ed8f09d975bf7
\ No newline at end of file
+80a54ebc41e4224ab93d92cb390524db1c398155
\ No newline at end of file

diff --git a/test/fts3defer2.test b/test/fts3defer2.test
index 3a4a3507210433ad9b669372be972b771fd9f019..7bf4210f13789a36fa00edb9e1e8e41bdf6cd9d8 100644 (file)
--- a/test/fts3defer2.test
+++ b/test/fts3defer2.test
@@ -74,9 +74,7 @@ do_execsql_test 1.3.1 { DROP TABLE t1 }
 #-----------------------------------------------------------------------------
 # Test cases fts3defer2-2.* focus specifically on the matchinfo function.
 # 
-do_execsql_test 2.1.1 {
-  CREATE VIRTUAL TABLE t2 USING fts4;
-}
+do_execsql_test 2.1.1 "CREATE VIRTUAL TABLE t2 USING fts4"
 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]
@@ -84,7 +82,6 @@ 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');
 }
-
 foreach {tn sql} {
   1 {}
   2 { INSERT INTO t2(t2) VALUES('optimize') }
@@ -93,7 +90,7 @@ foreach {tn sql} {
   }
 } {
   execsql $sql
-  do_execsql_test 2.2.$tn.1 {
+  do_execsql_test 2.2.$tn {
     SELECT mit(matchinfo(t2)) FROM t2 WHERE t2 MATCH 'a b';
   } [list                                          \
     [list 2 1  1 54 54  1 3 3  54 372 7]        \
@@ -101,6 +98,29 @@ foreach {tn sql} {
   ]
 }
 
+do_execsql_test 2.3.1 {
+  CREATE VIRTUAL TABLE t3 USING fts4;
+  INSERT INTO t3 VALUES('a b c d e f');
+  INSERT INTO t3 VALUES('x b c d e f');
+  INSERT INTO t3 VALUES('d e f a b c');
+  INSERT INTO t3 VALUES('b c d e f');
+}
+do_execsql_test 2.3.2 "
+  INSERT INTO t3 VALUES('f e d c b [string repeat {a } 10000]')
+"
+foreach {tn sql} {
+  1 {}
+  2 { INSERT INTO t3(t3) VALUES('optimize') }
+  3 { UPDATE t3_segments SET block = zeroblob(length(block)) 
+      WHERE length(block)>10000;
+  }
+} {
+  execsql $sql
+  do_execsql_test 2.4.$tn {
+    SELECT docid, mit(matchinfo(t3)) FROM t3 WHERE t3 MATCH '"a b c"';
+  } {1 {1 1 1 4 4 5 2006 6} 3 {1 1 1 4 4 5 2006 6}}
+}
+
 
 finish_test
 

diff --git a/test/permutations.test b/test/permutations.test
index 95896b6d34b009e745137302055a436ef929a368..ecf2dbece2477910fb32dd72a32310374e3b9929 100644 (file)
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -166,7 +166,7 @@ test_suite "fts3" -prefix "" -description {
   fts3ak.test fts3al.test fts3am.test fts3an.test fts3ao.test
   fts3atoken.test fts3b.test fts3c.test fts3cov.test fts3d.test
   fts3e.test fts3expr.test fts3expr2.test fts3near.test 
-  fts3query.test fts3snippet.test fts3defer.test
+  fts3query.test fts3snippet.test fts3defer.test fts3defer2.test
 }