Add tests for delete and update in fts1. (CVS 3481)

FossilOrigin-Name: b01c4371d861a087623a34c38cb8db74eca95348

diff --git a/manifest b/manifest
index 291cad65aedb35fdd0b66e1c40e1608d882bb2c2..38b60e5ef2e2a415e47316033097649ab480aa06 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C fts2\ssupport\sfor\stesting.\s\sThese\sare\sa\sprelude\sto\sadding\ssome\stest\nscripts.\s(CVS\s3480)
-D 2006-10-19T20:27:59
+C Add\stests\sfor\sdelete\sand\supdate\sin\sfts1.\s(CVS\s3481)
+D 2006-10-19T23:28:35
 F Makefile.in 4379c909d46b38b8c5db3533084601621d4f14b2
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -203,6 +203,8 @@ F test/fts1a.test 46090311f85da51bb33bd5ce84f7948359c6d8d7
 F test/fts1b.test 5d8a01aefbecc8b7442b36c94c05eb7a845462d5
 F test/fts1c.test 85a525ce7428907469b4cce13d5563ce542ce64c
 F test/fts1d.test a73deace5c18df4a549b12908bade4f05dcf1a2f
+F test/fts1e.test 77244843e925560b5a0b70069c3e7ab62f181ed2
+F test/fts1f.test cdab90834a7627a26fed2f75d2f451650fb31fad
 F test/fts1porter.test d86e9c3e0c7f8ff95add6582b4b585fb4e02b96d
 F test/func.test 0ed54b5aeaad319f68016c033acfebef56f5874a
 F test/hook.test 7e7645fd9a033f79cce8fdff151e32715e7ec50a
@@ -410,7 +412,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 0c6736df9cb4c3c8f6224e30df939cead9cd5369
-R 6f03c99cca7b9f6d813febccbed3ae0f
+P 004ad1943f8c5933ee9584a57b2de9d421470d3c
+R c1e87a25b098c32ca808ba399800175b
 U shess
-Z f6697812d050381edc7e4ca50f45486e
+Z d2ba853bd32eca67e15216614c4bfedc

diff --git a/manifest.uuid b/manifest.uuid
index 26d5aa78f19c67abce54939144cee9df5acca53a..caed138ac47864f3c9095f8ce47b5d6fbf45e281 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-004ad1943f8c5933ee9584a57b2de9d421470d3c
\ No newline at end of file
+b01c4371d861a087623a34c38cb8db74eca95348
\ No newline at end of file

diff --git a/test/fts1e.test b/test/fts1e.test
new file mode 100644 (file)
index 0000000..479cfac
--- /dev/null
+++ b/test/fts1e.test
@@ -0,0 +1,85 @@
+# 2006 October 19
+#
+# The author disclaims copyright to this source code.
+#
+#*************************************************************************
+# This file implements regression tests for SQLite library.  The
+# focus of this script is testing deletions in the FTS1 module.
+#
+# $Id: fts1e.test,v 1.1 2006/10/19 23:28:35 shess Exp $
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+# If SQLITE_ENABLE_FTS1 is defined, omit this file.
+ifcapable !fts1 {
+  finish_test
+  return
+}
+
+# Construct a full-text search table containing keywords which are the
+# ordinal numbers of the bit positions set for a sequence of integers,
+# which are used for the rowid.  There are a total of 30 INSERT and
+# DELETE statements, so that we'll test both the segmentMerge() merge
+# (over the first 16) and the termSelect() merge (over the level-1
+# segment and 14 level-0 segments).
+db eval {
+  CREATE VIRTUAL TABLE t1 USING fts1(content);
+  INSERT INTO t1 (rowid, content) VALUES(1, 'one');
+  INSERT INTO t1 (rowid, content) VALUES(2, 'two');
+  INSERT INTO t1 (rowid, content) VALUES(3, 'one two');
+  INSERT INTO t1 (rowid, content) VALUES(4, 'three');
+  DELETE FROM t1 WHERE rowid = 1;
+  INSERT INTO t1 (rowid, content) VALUES(5, 'one three');
+  INSERT INTO t1 (rowid, content) VALUES(6, 'two three');
+  INSERT INTO t1 (rowid, content) VALUES(7, 'one two three');
+  DELETE FROM t1 WHERE rowid = 4;
+  INSERT INTO t1 (rowid, content) VALUES(8, 'four');
+  INSERT INTO t1 (rowid, content) VALUES(9, 'one four');
+  INSERT INTO t1 (rowid, content) VALUES(10, 'two four');
+  DELETE FROM t1 WHERE rowid = 7;
+  INSERT INTO t1 (rowid, content) VALUES(11, 'one two four');
+  INSERT INTO t1 (rowid, content) VALUES(12, 'three four');
+  INSERT INTO t1 (rowid, content) VALUES(13, 'one three four');
+  DELETE FROM t1 WHERE rowid = 10;
+  INSERT INTO t1 (rowid, content) VALUES(14, 'two three four');
+  INSERT INTO t1 (rowid, content) VALUES(15, 'one two three four');
+  INSERT INTO t1 (rowid, content) VALUES(16, 'five');
+  DELETE FROM t1 WHERE rowid = 13;
+  INSERT INTO t1 (rowid, content) VALUES(17, 'one five');
+  INSERT INTO t1 (rowid, content) VALUES(18, 'two five');
+  INSERT INTO t1 (rowid, content) VALUES(19, 'one two five');
+  DELETE FROM t1 WHERE rowid = 16;
+  INSERT INTO t1 (rowid, content) VALUES(20, 'three five');
+  INSERT INTO t1 (rowid, content) VALUES(21, 'one three five');
+  INSERT INTO t1 (rowid, content) VALUES(22, 'two three five');
+  DELETE FROM t1 WHERE rowid = 19;
+  DELETE FROM t1 WHERE rowid = 22;
+}
+
+do_test fts1f-1.1 {
+  execsql {SELECT COUNT(*) FROM t1}
+} {14}
+
+do_test fts1e-2.1 {
+  execsql {SELECT rowid FROM t1 WHERE content MATCH 'one'}
+} {3 5 9 11 15 17 21}
+
+do_test fts1e-2.2 {
+  execsql {SELECT rowid FROM t1 WHERE content MATCH 'two'}
+} {2 3 6 11 14 15 18}
+
+do_test fts1e-2.3 {
+  execsql {SELECT rowid FROM t1 WHERE content MATCH 'three'}
+} {5 6 12 14 15 20 21}
+
+do_test fts1e-2.4 {
+  execsql {SELECT rowid FROM t1 WHERE content MATCH 'four'}
+} {8 9 11 12 14 15}
+
+do_test fts1e-2.5 {
+  execsql {SELECT rowid FROM t1 WHERE content MATCH 'five'}
+} {17 18 20 21}
+
+finish_test

diff --git a/test/fts1f.test b/test/fts1f.test
new file mode 100644 (file)
index 0000000..79f2b7c
--- /dev/null
+++ b/test/fts1f.test
@@ -0,0 +1,90 @@
+# 2006 October 19
+#
+# The author disclaims copyright to this source code.
+#
+#*************************************************************************
+# This file implements regression tests for SQLite library.  The
+# focus of this script is testing updates in the FTS1 module.
+#
+# $Id: fts1f.test,v 1.1 2006/10/19 23:28:35 shess Exp $
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+# If SQLITE_ENABLE_FTS1 is defined, omit this file.
+ifcapable !fts1 {
+  finish_test
+  return
+}
+
+# Construct a full-text search table containing keywords which are the
+# ordinal numbers of the bit positions set for a sequence of integers,
+# which are used for the rowid.  There are a total of 31 INSERT,
+# UPDATE, and DELETE statements, so that we'll test both the
+# segmentMerge() merge (over the first 16) and the termSelect() merge
+# (over the level-1 segment and 15 level-0 segments).
+db eval {
+  CREATE VIRTUAL TABLE t1 USING fts1(content);
+  INSERT INTO t1 (rowid, content) VALUES(1, 'one');
+  INSERT INTO t1 (rowid, content) VALUES(2, 'two');
+  INSERT INTO t1 (rowid, content) VALUES(3, 'one two');
+  INSERT INTO t1 (rowid, content) VALUES(4, 'three');
+  INSERT INTO t1 (rowid, content) VALUES(5, 'one three');
+  INSERT INTO t1 (rowid, content) VALUES(6, 'two three');
+  INSERT INTO t1 (rowid, content) VALUES(7, 'one two three');
+  DELETE FROM t1 WHERE rowid = 4;
+  INSERT INTO t1 (rowid, content) VALUES(8, 'four');
+  UPDATE t1 SET content = 'update one three' WHERE rowid = 1;
+  INSERT INTO t1 (rowid, content) VALUES(9, 'one four');
+  INSERT INTO t1 (rowid, content) VALUES(10, 'two four');
+  DELETE FROM t1 WHERE rowid = 7;
+  INSERT INTO t1 (rowid, content) VALUES(11, 'one two four');
+  INSERT INTO t1 (rowid, content) VALUES(12, 'three four');
+  INSERT INTO t1 (rowid, content) VALUES(13, 'one three four');
+  DELETE FROM t1 WHERE rowid = 10;
+  INSERT INTO t1 (rowid, content) VALUES(14, 'two three four');
+  INSERT INTO t1 (rowid, content) VALUES(15, 'one two three four');
+  UPDATE t1 SET content = 'update two five' WHERE rowid = 8;
+  INSERT INTO t1 (rowid, content) VALUES(16, 'five');
+  DELETE FROM t1 WHERE rowid = 13;
+  INSERT INTO t1 (rowid, content) VALUES(17, 'one five');
+  INSERT INTO t1 (rowid, content) VALUES(18, 'two five');
+  INSERT INTO t1 (rowid, content) VALUES(19, 'one two five');
+  DELETE FROM t1 WHERE rowid = 16;
+  INSERT INTO t1 (rowid, content) VALUES(20, 'three five');
+  INSERT INTO t1 (rowid, content) VALUES(21, 'one three five');
+  INSERT INTO t1 (rowid, content) VALUES(22, 'two three five');
+  DELETE FROM t1 WHERE rowid = 19;
+  UPDATE t1 SET content = 'update' WHERE rowid = 15;
+}
+
+do_test fts1f-1.1 {
+  execsql {SELECT COUNT(*) FROM t1}
+} {16}
+
+do_test fts1e-2.0 {
+  execsql {SELECT rowid FROM t1 WHERE content MATCH 'update'}
+} {1 8 15}
+
+do_test fts1e-2.1 {
+  execsql {SELECT rowid FROM t1 WHERE content MATCH 'one'}
+} {1 3 5 9 11 17 21}
+
+do_test fts1e-2.2 {
+  execsql {SELECT rowid FROM t1 WHERE content MATCH 'two'}
+} {2 3 6 8 11 14 18 22}
+
+do_test fts1e-2.3 {
+  execsql {SELECT rowid FROM t1 WHERE content MATCH 'three'}
+} {1 5 6 12 14 20 21 22}
+
+do_test fts1e-2.4 {
+  execsql {SELECT rowid FROM t1 WHERE content MATCH 'four'}
+} {9 11 12 14}
+
+do_test fts1e-2.5 {
+  execsql {SELECT rowid FROM t1 WHERE content MATCH 'five'}
+} {8 17 18 20 21 22}
+
+finish_test