From 07490d2b8afad96498830f7f3f8a33aa0428175d Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Sat, 28 Sep 2013 16:43:49 +0000
Subject: [PATCH] Add new test file fts3defer3.test.

FossilOrigin-Name: a6cd14effef0a4e5520eea871523e6e7a7d30aef
---
 manifest             | 13 +++----
 manifest.uuid        |  2 +-
 test/fts3defer3.test | 84 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+), 7 deletions(-)
 create mode 100644 test/fts3defer3.test

diff --git a/manifest b/manifest
index 940c3161c9..db8d44d652 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\snextchar.c\sextension,\sallow\sthe\ssecond\sargument\sto\sthe\snext_char()\nfunction\sto\sbe\sa\ssubquery.
-D 2013-09-28T13:28:40.044
+C Add\snew\stest\sfile\sfts3defer3.test.
+D 2013-09-28T16:43:49.441
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -530,6 +530,7 @@ F test/fts3cov.test e0fb00d8b715ddae4a94c305992dfc3ef70353d7
 F test/fts3d.test bf640d79722b720fa1c81834c48cdaa45d531b1a
 F test/fts3defer.test 0be4440b73a2e651fc1e472066686d6ada4b9963
 F test/fts3defer2.test a3b6cbeabaf28c9398652a4d101ea224d9358479
+F test/fts3defer3.test dd53fc13223c6d8264a98244e9b19abd35ed71cd
 F test/fts3drop.test 1b906e293d6773812587b3dc458cb9e8f3f0c297
 F test/fts3e.test 1f6c6ac9cc8b772ca256e6b22aaeed50c9350851
 F test/fts3expr.test 5e745b2b6348499d9ef8d59015de3182072c564c
@@ -1114,7 +1115,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 3e5c7771fa91d8ae1e495432329b87af87b1ebc6
-R bb54656333ff4fe5a15ca34798091088
-U drh
-Z 1c4ddf4d2e197076ecab06baedb0ed89
+P 59b9fa223681a7329533b350be7bf5a0a3609255
+R 7336f72aab2182861a3d9c1776c0dd0f
+U dan
+Z 1b6fafd93a8bee6addb58d8182d7841c
diff --git a/manifest.uuid b/manifest.uuid
index f11d32ba7a..c4fa535c48 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-59b9fa223681a7329533b350be7bf5a0a3609255
\ No newline at end of file
+a6cd14effef0a4e5520eea871523e6e7a7d30aef
\ No newline at end of file
diff --git a/test/fts3defer3.test b/test/fts3defer3.test
new file mode 100644
index 0000000000..a795e92bcf
--- /dev/null
+++ b/test/fts3defer3.test
@@ -0,0 +1,84 @@
+# 2010 October 23
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+# This file contains a very simple test to show that the deferred tokens
+# optimization is doing something.
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+source $testdir/malloc_common.tcl
+ifcapable !fts3||!fts4_deferred {
+  finish_test 
+  return
+}
+set testprefix fts3defer3
+
+set nDoclist 3204
+set nDoc     800
+
+# Set up a database that contains 800 rows. Each row contains the document
+# "b b", except for the row with docid=200, which contains "a b". Hence
+# token "b" is extremely common and token "a" is not.
+#
+do_test 1.1 {
+  execsql {
+    CREATE VIRTUAL TABLE t1 USING fts4;
+      BEGIN;
+  }
+  for {set i 1} {$i <= $nDoc} {incr i} {
+    set document "b b"
+    if {$i==200} { set document "a b" }
+    execsql { INSERT INTO t1 (docid, content) VALUES($i, $document) }
+  }
+  execsql COMMIT
+} {}
+
+# Check that the db contains two doclists. A small one for "a" and a 
+# larger one for "b".
+#
+do_execsql_test 1.2 {
+  SELECT blockid, length(block) FROM t1_segments;
+} [list 1 8 2 $nDoclist]
+
+# Query for 'a b'. Although this test doesn't prove so, token "b" will 
+# be deferred because of the very large associated doclist.
+#
+do_execsql_test 1.3 {
+  SELECT docid, content FROM t1 WHERE t1 MATCH 'a b';
+} {200 {a b}}
+
+# Zero out the doclist for token "b" within the database file. Now the 
+# only queries that use token "b" that will work are those that defer
+# it. Any query that tries to use the doclist belonging to token "b"
+# will fail.
+#
+do_test 1.4 {
+  set fd [db incrblob t1_segments block 2]
+  puts -nonewline $fd [string repeat "\00" $nDoclist]
+  close $fd
+} {}
+
+# The first two queries succeed, as they defer token "b". The last one
+# fails, as it tries to load the corrupt doclist.
+#
+do_execsql_test 1.5 {
+  SELECT docid, content FROM t1 WHERE t1 MATCH 'a b';
+} {200 {a b}}
+do_execsql_test 1.6 {
+  SELECT count(*) FROM t1 WHERE t1 MATCH 'a b';
+} {1}
+do_catchsql_test 1.7 {
+  SELECT count(*) FROM t1 WHERE t1 MATCH 'b';
+} {1 {database disk image is malformed}}
+
+
+finish_test