-C In\sthe\sfts3view\sutility,\slabel\sthe\sblank\ssegments\sused\sto\smark\sthe\send\sof\sa\nsegment\ssequence\sfor\sa\slevel/idx\sas\s"null".\s\sImprove\sthe\salignment\sof\sroot\nsegment\snames.
-D 2012-03-27T14:54:44.486
+C Remove\sthe\sfts3merge.test\sscript\sin\sfavour\sof\schanging\sthe\sfts4merge.test\sscript\sso\sthat\sit\sruns\stests\susing\sboth\sfts4\sand\sfts3.\sFix\ssome\sproblems\swith\sincr-merge\sand\sFTS3\stables.
+D 2012-03-27T15:00:06.725
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9
F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c 5e2d74de50f5b591703923b765e74832621b7c3a
+F ext/fts3/fts3.c f41f52a24f1a9d7f94291a0e17027e0c28e4f54b
F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
-F ext/fts3/fts3Int.h 133e5c613ac6920be5b914d43acc1478df1332e1
+F ext/fts3/fts3Int.h 5fd2ec4e47faf17bf4a508d6b8ec5fc0f2c80bff
F ext/fts3/fts3_aux.c 5205182bd8f372782597888156404766edf5781e
F ext/fts3/fts3_expr.c dbc7ba4c3a6061adde0f38ed8e9b349568299551
F ext/fts3/fts3_hash.c 8dd2d06b66c72c628c2732555a32bc0943114914
F ext/fts3/fts3_hash.h 8331fb2206c609f9fc4c4735b9ab5ad6137c88ec
F ext/fts3/fts3_icu.c 6c8f395cdf9e1e3afa7fadb7e523dbbf381c6dfa
F ext/fts3/fts3_porter.c a465b49fcb8249a755792f87516eff182efa42b3
-F ext/fts3/fts3_snippet.c c9e126c20760988aa7c43c6ea1379db34738282e
+F ext/fts3/fts3_snippet.c 51a3a34c217e24678a133782c1dfb6f2f70fe559
F ext/fts3/fts3_term.c d3466cf99432291be08e379d89645462431809d6
F ext/fts3/fts3_test.c 6b7cc68aef4efb084e1449f7d20c4b20d3bdf6b4
F ext/fts3/fts3_tokenizer.c 3da7254a9881f7e270ab28e2004e0d22b3212bce
F ext/fts3/fts3_tokenizer.h 66dec98e365854b6cd2d54f1a96bb6d428fc5a68
F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
-F ext/fts3/fts3_write.c a9990753ba132cd79b666c61ec58ae15eb032387
+F ext/fts3/fts3_write.c ceb65d6a85f44c7dd1d96f12d04e20f75884bfe3
F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
F ext/fts3/tool/fts3view.c 2c7f1bc1feddca85397be174fb6871007c27898b
F test/fts2r.test b154c30b63061d8725e320fba1a39e2201cadd5e
F test/fts2token.test d8070b241a15ff13592a9ae4a8b7c171af6f445a
F test/fts3.test 672a040ea57036fb4b6fdc09027c18d7d24ab654
-F test/fts3_common.tcl 52423d0f15bca1d1d2f2b432f0542c4036d655c7
+F test/fts3_common.tcl 99cf6659b87c0f74f55963c2aea03b3a7d66ceb0
F test/fts3aa.test 909d5f530d30a8e36b9328d67285eae6537c79c0
F test/fts3ab.test 09aeaa162aee6513d9ff336b6932211008b9d1f9
F test/fts3ac.test 636ed7486043055d4f126a0e385f2d5a82ebbf63
F test/fts3snippet.test 8e956051221a34c7daeb504f023cb54d5fa5a8b2
F test/fts3sort.test 95be0b19d7e41c44b29014f13ea8bddd495fd659
F test/fts4aa.test 6e7f90420b837b2c685f3bcbe84c868492d40a68
-F test/fts4check.test 72134071f4e9f8bed76af1f2375fd5aff0c5ea48
+F test/fts4check.test 66fa274cab2b615f2fb338b257713aba8fad88a8
F test/fts4content.test 17b2360f7d1a9a7e5aa8022783f5c5731b6dfd4f
F test/fts4langid.test 24a6e41063b416bbdf371ff6b4476fa41c194aa7
-F test/fts4merge.test c7ee5fbb3b316d1496f1d2fa861c53840b84cef9
+F test/fts4merge.test c424309743fdd203f8e56a1f1cd7872cd66cc0ee
F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891
F test/fts4merge3.test e0e21332f592fc003fcab112928ea891407d83cb
F test/func.test 6c5ce11e3a0021ca3c0649234e2d4454c89110ca
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P e9436d8038e5a0d1ba992a77d1064d4a55595f57
-R 539ad1cd9b19a07386b41fe8ff2433cc
-U drh
-Z cd0ad279479f240b2399ce3360a34f55
+P 04aea0245e4183fef3664609f5a6353b65d71a85
+R b8c319973c3298c33d22a9e309ade35c
+U dan
+Z fbf5edaf3f2b7351822253f4d48708a9
set testdir [file dirname $argv0]
source $testdir/tester.tcl
source $testdir/fts3_common.tcl
-set ::testprefix fts4merge
# If SQLITE_ENABLE_FTS3 is defined, omit this file.
ifcapable !fts3 {
return "ok"
}
-#-------------------------------------------------------------------------
-# Test cases 1.*
-#
-do_test 1.0 { fts3_build_db_1 1004 } {}
-do_test 1.1 { fts3_integrity_check t1 } {ok}
-do_execsql_test 1.1 {
- SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level
-} {
- 0 {0 1 2 3 4 5 6 7 8 9 10 11}
- 1 {0 1 2 3 4 5 6 7 8 9 10 11 12 13}
- 2 {0 1 2}
-}
-
-for {set i 0} {$i<20} {incr i} {
- do_execsql_test 1.2.$i.1 { INSERT INTO t1(t1) VALUES('merge=1') }
- do_test 1.2.$i.2 { fts3_integrity_check t1 } ok
- do_execsql_test 1.2.$i.3 {
- SELECT docid FROM t1 WHERE t1 MATCH 'zero one two three'
- } {123 132 213 231 312 321}
-}
-
-do_execsql_test 1.3 {
- SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level
-} {
- 0 {0 1 2 3}
- 1 {0 1 2 3 4 5 6}
- 2 {0 1 2 3}
-}
-
-for {set i 0} {$i<100} {incr i} {
- do_execsql_test 1.4.$i { INSERT INTO t1(t1) VALUES('merge=1,4') }
- do_test 1.4.$i.2 { fts3_integrity_check t1 } ok
- do_execsql_test 1.4.$i.3 {
- SELECT docid FROM t1 WHERE t1 MATCH 'zero one two three'
- } {123 132 213 231 312 321}
-}
-
-do_execsql_test 1.5 {
- SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level
-} {
- 2 {0 1}
- 3 0
-}
-
-#-------------------------------------------------------------------------
-# Test cases 2.* test that errors in the xxx part of the 'merge=xxx' are
-# handled correctly.
-#
-do_execsql_test 2.0 { CREATE VIRTUAL TABLE t2 USING fts4 }
-
-foreach {tn arg} {
- 1 {merge=abc}
- 2 {merge=%%%}
- 3 {merge=,}
- 4 {merge=5,}
- 5 {merge=6,%}
- 6 {merge=6,six}
- 7 {merge=6,1}
- 8 {merge=6,0}
-} {
- do_catchsql_test 2.$tn {
- INSERT INTO t2(t2) VALUES($arg);
- } {1 {SQL logic error or missing database}}
-}
-
-#-------------------------------------------------------------------------
-# Test cases 3.*
-#
-do_test 3.0 {
+foreach mod {fts3 fts4} {
+ set ::testprefix fts4merge-$mod
reset_db
- execsql { PRAGMA page_size = 512 }
- fts3_build_db_2 30040
-} {}
-do_test 3.1 { fts3_integrity_check t2 } {ok}
-
-do_execsql_test 3.2 {
- SELECT level, group_concat(idx, ' ') FROM t2_segdir GROUP BY level
-} {
- 0 {0 1 2 3 4 5 6}
- 1 {0 1 2 3 4}
- 2 {0 1 2 3 4}
- 3 {0 1 2 3 4 5 6}
-}
-
-do_execsql_test 3.3 {
- INSERT INTO t2(t2) VALUES('merge=1000000,2');
- SELECT level, group_concat(idx, ' ') FROM t2_segdir GROUP BY level
-} {
- 0 0
- 2 0
- 3 0
- 4 0
- 6 0
-}
-
-#-------------------------------------------------------------------------
-# Test cases 4.*
-#
-reset_db
-do_execsql_test 4.1 {
- PRAGMA page_size = 512;
- CREATE VIRTUAL TABLE t4 USING fts4;
- PRAGMA main.page_size;
-} {512}
-do_test 4.2 {
- foreach x {a c b d e f g h i j k l m n o p} {
- execsql "INSERT INTO t4 VALUES('[string repeat $x 600]')"
+ #-------------------------------------------------------------------------
+ # Test cases 1.*
+ #
+ do_test 1.0 { fts3_build_db_1 -module $mod 1004 } {}
+ do_test 1.1 { fts3_integrity_check t1 } {ok}
+ do_execsql_test 1.1 {
+ SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level
+ } {
+ 0 {0 1 2 3 4 5 6 7 8 9 10 11}
+ 1 {0 1 2 3 4 5 6 7 8 9 10 11 12 13}
+ 2 {0 1 2}
}
- execsql {SELECT level, group_concat(idx, ' ') FROM t4_segdir GROUP BY level}
-} {0 {0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15}}
-
-foreach {tn expect} {
- 1 "0 {0 1 2 3 4 5 6 7 8 9 10 11 12 13} 1 0"
- 2 "0 {0 1 2 3 4 5 6 7 8 9 10 11 12} 1 0"
- 3 "0 {0 1 2 3 4 5 6 7 8 9 10 11} 1 0"
- 4 "0 {0 1 2 3 4 5 6 7 8 9 10} 1 0"
- 5 "0 {0 1 2 3 4 5 6 7 8 9} 1 0"
- 6 "0 {0 1 2 3 4 5 6 7 8} 1 0"
- 7 "0 {0 1 2 3 4 5 6 7} 1 0"
- 8 "0 {0 1 2 3 4 5 6} 1 0"
- 9 "0 {0 1 2 3 4 5} 1 0"
-} {
- do_execsql_test 4.3.$tn {
- INSERT INTO t4(t4) VALUES('merge=1,16');
- SELECT level, group_concat(idx, ' ') FROM t4_segdir GROUP BY level;
- } $expect
-}
-
-do_execsql_test 4.4.1 {
- SELECT quote(value) FROM t4_stat WHERE rowid=1
-} {X'0006'}
-
-do_execsql_test 4.4.2 {
- DELETE FROM t4_stat WHERE rowid=1;
- INSERT INTO t4(t4) VALUES('merge=1,12');
- SELECT level, group_concat(idx, ' ') FROM t4_segdir GROUP BY level;
-} "0 {0 1 2 3 4 5} 1 0"
-
-
-#-------------------------------------------------------------------------
-# Test cases 5.*
-#
-# Test that if a crisis-merge occurs that disrupts an ongoing incremental
-# merge, the next call to "merge=A,B" identifies this and starts a new
-# incremental merge. There are two scenarios:
-#
-# * There are less segments on the input level that the disrupted
-# incremental merge operated on, or
-#
-# * Sufficient segments exist on the input level but the segments
-# contain keys smaller than the largest key in the potential output
-# segment.
-#
-do_test 5.1 {
- reset_db
- fts3_build_db_1 1000
-} {}
-
-do_execsql_test 5.2 {
- SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level;
-} {
- 0 {0 1 2 3 4 5 6 7}
- 1 {0 1 2 3 4 5 6 7 8 9 10 11 12 13}
- 2 {0 1 2}
-}
-
-do_execsql_test 5.3 {
- INSERT INTO t1(t1) VALUES('merge=1,5');
- INSERT INTO t1(t1) VALUES('merge=1,5');
- SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level;
-} {
- 0 {0 1 2}
- 1 {0 1 2 3 4 5 6 7 8 9 10 11 12 13 14}
- 2 {0 1 2 3}
-}
-
-do_execsql_test 5.4 {SELECT quote(value) from t1_stat WHERE rowid=1} {X'0105'}
-do_test 5.5 {
- foreach docid [execsql {SELECT docid FROM t1}] {
- execsql {INSERT INTO t1 SELECT * FROM t1 WHERE docid=$docid}
+
+ for {set i 0} {$i<20} {incr i} {
+ do_execsql_test 1.2.$i.1 { INSERT INTO t1(t1) VALUES('merge=1') }
+ do_test 1.2.$i.2 { fts3_integrity_check t1 } ok
+ do_execsql_test 1.2.$i.3 {
+ SELECT docid FROM t1 WHERE t1 MATCH 'zero one two three'
+ } {123 132 213 231 312 321}
}
-} {}
-
-do_execsql_test 5.6 {SELECT quote(value) from t1_stat WHERE rowid=1} {X'0105'}
-
-do_execsql_test 5.7 {
- SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level;
- SELECT quote(value) from t1_stat WHERE rowid=1;
-} {
- 0 {0 1 2 3 4 5 6 7 8 9 10}
- 1 {0 1 2 3 4 5 6 7 8 9 10 11 12}
- 2 {0 1 2 3 4 5 6 7}
- X'0105'
-}
-
-do_execsql_test 5.8 {
- INSERT INTO t1(t1) VALUES('merge=1,6');
- INSERT INTO t1(t1) VALUES('merge=1,6');
- SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level;
- SELECT quote(value) from t1_stat WHERE rowid=1;
-} {
- 0 {0 1 2 3 4}
- 1 {0 1 2 3 4 5 6 7 8 9 10 11 12 13}
- 2 {0 1 2 3 4 5 6 7 8} X'0106'
-}
-
-do_test 5.8.1 { fts3_integrity_check t1 } ok
-
-do_test 5.9 {
- set L [expr 16*16*7 + 16*3 + 12]
- foreach docid [execsql {
- SELECT docid FROM t1 UNION ALL SELECT docid FROM t1 LIMIT $L
- }] {
- execsql {INSERT INTO t1 SELECT * FROM t1 WHERE docid=$docid}
+
+ do_execsql_test 1.3 {
+ SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level
+ } {
+ 0 {0 1 2 3}
+ 1 {0 1 2 3 4 5 6}
+ 2 {0 1 2 3}
}
-} {}
-
-do_execsql_test 5.10 {
- SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level;
- SELECT quote(value) from t1_stat WHERE rowid=1;
-} {
- 0 0 1 {0 1} 2 0 3 0 X'0106'
-}
-
-do_execsql_test 5.11 {
- INSERT INTO t1(t1) VALUES('merge=1,6');
- SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level;
- SELECT quote(value) from t1_stat WHERE rowid=1;
-} {
- 0 0 1 {0 1} 2 0 3 0 X''
-}
-
-#-------------------------------------------------------------------------
-# Test cases 6.*
-#
-# At one point the following test caused an assert() to fail (because the
-# second 'merge=1,2' operation below actually "merges" a single input
-# segment, which was unexpected).
-#
-do_test 6.1 {
- reset_db
- set a [string repeat a 900]
- set b [string repeat b 900]
- set c [string repeat c 900]
- set d [string repeat d 900]
- execsql {
- CREATE VIRTUAL TABLE t1 USING fts4;
- BEGIN;
- INSERT INTO t1 VALUES($a);
- INSERT INTO t1 VALUES($b);
- COMMIT;
- BEGIN;
- INSERT INTO t1 VALUES($c);
- INSERT INTO t1 VALUES($d);
- COMMIT;
+
+ for {set i 0} {$i<100} {incr i} {
+ do_execsql_test 1.4.$i { INSERT INTO t1(t1) VALUES('merge=1,4') }
+ do_test 1.4.$i.2 { fts3_integrity_check t1 } ok
+ do_execsql_test 1.4.$i.3 {
+ SELECT docid FROM t1 WHERE t1 MATCH 'zero one two three'
+ } {123 132 213 231 312 321}
}
-
- execsql {
- INSERT INTO t1(t1) VALUES('merge=1,2');
- INSERT INTO t1(t1) VALUES('merge=1,2');
+
+ do_execsql_test 1.5 {
+ SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level
+ } {
+ 2 {0 1}
+ 3 0
}
-} {}
-
-#-------------------------------------------------------------------------
-# Test cases 7.*
-#
-# Test that the value returned by sqlite3_total_changes() increases by
-# 1 following a no-op "merge=A,B", or by more than 1 if actual work is
-# performed.
-#
-do_test 7.0 {
+
+ #-------------------------------------------------------------------------
+ # Test cases 2.* test that errors in the xxx part of the 'merge=xxx' are
+ # handled correctly.
+ #
+ do_execsql_test 2.0 "CREATE VIRTUAL TABLE t2 USING $mod"
+
+ foreach {tn arg} {
+ 1 {merge=abc}
+ 2 {merge=%%%}
+ 3 {merge=,}
+ 4 {merge=5,}
+ 5 {merge=6,%}
+ 6 {merge=6,six}
+ 7 {merge=6,1}
+ 8 {merge=6,0}
+ } {
+ do_catchsql_test 2.$tn {
+ INSERT INTO t2(t2) VALUES($arg);
+ } {1 {SQL logic error or missing database}}
+ }
+
+ #-------------------------------------------------------------------------
+ # Test cases 3.*
+ #
+ do_test 3.0 {
+ reset_db
+ execsql { PRAGMA page_size = 512 }
+ fts3_build_db_2 -module $mod 30040
+ } {}
+ do_test 3.1 { fts3_integrity_check t2 } {ok}
+
+ do_execsql_test 3.2 {
+ SELECT level, group_concat(idx, ' ') FROM t2_segdir GROUP BY level
+ } {
+ 0 {0 1 2 3 4 5 6}
+ 1 {0 1 2 3 4}
+ 2 {0 1 2 3 4}
+ 3 {0 1 2 3 4 5 6}
+ }
+
+ do_execsql_test 3.3 {
+ INSERT INTO t2(t2) VALUES('merge=1000000,2');
+ SELECT level, group_concat(idx, ' ') FROM t2_segdir GROUP BY level
+ } {
+ 0 0
+ 2 0
+ 3 0
+ 4 0
+ 6 0
+ }
+
+ #-------------------------------------------------------------------------
+ # Test cases 4.*
+ #
reset_db
- fts3_build_db_1 1000
-} {}
+ do_execsql_test 4.1 "
+ PRAGMA page_size = 512;
+ CREATE VIRTUAL TABLE t4 USING $mod;
+ PRAGMA main.page_size;
+ " {512}
+
+ do_test 4.2 {
+ foreach x {a c b d e f g h i j k l m n o p} {
+ execsql "INSERT INTO t4 VALUES('[string repeat $x 600]')"
+ }
+ execsql {SELECT level, group_concat(idx, ' ') FROM t4_segdir GROUP BY level}
+ } {0 {0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15}}
+
+ foreach {tn expect} {
+ 1 "0 {0 1 2 3 4 5 6 7 8 9 10 11 12 13} 1 0"
+ 2 "0 {0 1 2 3 4 5 6 7 8 9 10 11 12} 1 0"
+ 3 "0 {0 1 2 3 4 5 6 7 8 9 10 11} 1 0"
+ 4 "0 {0 1 2 3 4 5 6 7 8 9 10} 1 0"
+ 5 "0 {0 1 2 3 4 5 6 7 8 9} 1 0"
+ 6 "0 {0 1 2 3 4 5 6 7 8} 1 0"
+ 7 "0 {0 1 2 3 4 5 6 7} 1 0"
+ 8 "0 {0 1 2 3 4 5 6} 1 0"
+ 9 "0 {0 1 2 3 4 5} 1 0"
+ } {
+ do_execsql_test 4.3.$tn {
+ INSERT INTO t4(t4) VALUES('merge=1,16');
+ SELECT level, group_concat(idx, ' ') FROM t4_segdir GROUP BY level;
+ } $expect
+ }
+
+ do_execsql_test 4.4.1 {
+ SELECT quote(value) FROM t4_stat WHERE rowid=1
+ } {X'0006'}
+
+ do_execsql_test 4.4.2 {
+ DELETE FROM t4_stat WHERE rowid=1;
+ INSERT INTO t4(t4) VALUES('merge=1,12');
+ SELECT level, group_concat(idx, ' ') FROM t4_segdir GROUP BY level;
+ } "0 {0 1 2 3 4 5} 1 0"
+
+
+ #-------------------------------------------------------------------------
+ # Test cases 5.*
+ #
+ # Test that if a crisis-merge occurs that disrupts an ongoing incremental
+ # merge, the next call to "merge=A,B" identifies this and starts a new
+ # incremental merge. There are two scenarios:
+ #
+ # * There are less segments on the input level that the disrupted
+ # incremental merge operated on, or
+ #
+ # * Sufficient segments exist on the input level but the segments
+ # contain keys smaller than the largest key in the potential output
+ # segment.
+ #
+ do_test 5.1 {
+ reset_db
+ fts3_build_db_1 -module $mod 1000
+ } {}
+
+ do_execsql_test 5.2 {
+ SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level;
+ } {
+ 0 {0 1 2 3 4 5 6 7}
+ 1 {0 1 2 3 4 5 6 7 8 9 10 11 12 13}
+ 2 {0 1 2}
+ }
+
+ do_execsql_test 5.3 {
+ INSERT INTO t1(t1) VALUES('merge=1,5');
+ INSERT INTO t1(t1) VALUES('merge=1,5');
+ SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level;
+ } {
+ 0 {0 1 2}
+ 1 {0 1 2 3 4 5 6 7 8 9 10 11 12 13 14}
+ 2 {0 1 2 3}
+ }
+
+ do_execsql_test 5.4 {SELECT quote(value) from t1_stat WHERE rowid=1} {X'0105'}
+ do_test 5.5 {
+ foreach docid [execsql {SELECT docid FROM t1}] {
+ execsql {INSERT INTO t1 SELECT * FROM t1 WHERE docid=$docid}
+ }
+ } {}
+
+ do_execsql_test 5.6 {SELECT quote(value) from t1_stat WHERE rowid=1} {X'0105'}
+
+ do_execsql_test 5.7 {
+ SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level;
+ SELECT quote(value) from t1_stat WHERE rowid=1;
+ } {
+ 0 {0 1 2 3 4 5 6 7 8 9 10}
+ 1 {0 1 2 3 4 5 6 7 8 9 10 11 12}
+ 2 {0 1 2 3 4 5 6 7}
+ X'0105'
+ }
+
+ do_execsql_test 5.8 {
+ INSERT INTO t1(t1) VALUES('merge=1,6');
+ INSERT INTO t1(t1) VALUES('merge=1,6');
+ SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level;
+ SELECT quote(value) from t1_stat WHERE rowid=1;
+ } {
+ 0 {0 1 2 3 4}
+ 1 {0 1 2 3 4 5 6 7 8 9 10 11 12 13}
+ 2 {0 1 2 3 4 5 6 7 8} X'0106'
+ }
+
+ do_test 5.8.1 { fts3_integrity_check t1 } ok
+
+ do_test 5.9 {
+ set L [expr 16*16*7 + 16*3 + 12]
+ foreach docid [execsql {
+ SELECT docid FROM t1 UNION ALL SELECT docid FROM t1 LIMIT $L
+ }] {
+ execsql {INSERT INTO t1 SELECT * FROM t1 WHERE docid=$docid}
+ }
+ } {}
+
+ do_execsql_test 5.10 {
+ SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level;
+ SELECT quote(value) from t1_stat WHERE rowid=1;
+ } {
+ 0 0 1 {0 1} 2 0 3 0 X'0106'
+ }
+
+ do_execsql_test 5.11 {
+ INSERT INTO t1(t1) VALUES('merge=1,6');
+ SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level;
+ SELECT quote(value) from t1_stat WHERE rowid=1;
+ } {
+ 0 0 1 {0 1} 2 0 3 0 X''
+ }
+
+ #-------------------------------------------------------------------------
+ # Test cases 6.*
+ #
+ # At one point the following test caused an assert() to fail (because the
+ # second 'merge=1,2' operation below actually "merges" a single input
+ # segment, which was unexpected).
+ #
+ do_test 6.1 {
+ reset_db
+ set a [string repeat a 900]
+ set b [string repeat b 900]
+ set c [string repeat c 900]
+ set d [string repeat d 900]
+
+ execsql "CREATE VIRTUAL TABLE t1 USING $mod"
+ execsql {
+ BEGIN;
+ INSERT INTO t1 VALUES($a);
+ INSERT INTO t1 VALUES($b);
+ COMMIT;
+ BEGIN;
+ INSERT INTO t1 VALUES($c);
+ INSERT INTO t1 VALUES($d);
+ COMMIT;
+ }
+
+ execsql {
+ INSERT INTO t1(t1) VALUES('merge=1,2');
+ INSERT INTO t1(t1) VALUES('merge=1,2');
+ }
+ } {}
+
+ #-------------------------------------------------------------------------
+ # Test cases 7.*
+ #
+ # Test that the value returned by sqlite3_total_changes() increases by
+ # 1 following a no-op "merge=A,B", or by more than 1 if actual work is
+ # performed.
+ #
+ do_test 7.0 {
+ reset_db
+ fts3_build_db_1 -module $mod 1000
+ } {}
+
+ do_execsql_test 7.1 {
+ SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level
+ } {
+ 0 {0 1 2 3 4 5 6 7}
+ 1 {0 1 2 3 4 5 6 7 8 9 10 11 12 13}
+ 2 {0 1 2}
+ }
+ do_test 7.2 {
+ set x [db total_changes]
+ execsql { INSERT INTO t1(t1) VALUES('merge=2,10') }
+ expr { ([db total_changes] - $x)>1 }
+ } {1}
+ do_test 7.3 {
+ set x [db total_changes]
+ execsql { INSERT INTO t1(t1) VALUES('merge=200,10') }
+ expr { ([db total_changes] - $x)>1 }
+ } {1}
+ do_test 7.4 {
+ set x [db total_changes]
+ execsql { INSERT INTO t1(t1) VALUES('merge=200,10') }
+ expr { ([db total_changes] - $x)>1 }
+ } {0}
+ do_test 7.5 {
+ set x [db total_changes]
+ execsql { INSERT INTO t1(t1) VALUES('merge=200,10') }
+ expr { ([db total_changes] - $x)>1 }
+ } {0}
-do_execsql_test 7.1 {
- SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level
-} {
- 0 {0 1 2 3 4 5 6 7}
- 1 {0 1 2 3 4 5 6 7 8 9 10 11 12 13}
- 2 {0 1 2}
}
-do_test 7.2 {
- set x [db total_changes]
- execsql { INSERT INTO t1(t1) VALUES('merge=2,10') }
- expr { ([db total_changes] - $x)>1 }
-} {1}
-do_test 7.3 {
- set x [db total_changes]
- execsql { INSERT INTO t1(t1) VALUES('merge=200,10') }
- expr { ([db total_changes] - $x)>1 }
-} {1}
-do_test 7.4 {
- set x [db total_changes]
- execsql { INSERT INTO t1(t1) VALUES('merge=200,10') }
- expr { ([db total_changes] - $x)>1 }
-} {0}
-do_test 7.5 {
- set x [db total_changes]
- execsql { INSERT INTO t1(t1) VALUES('merge=200,10') }
- expr { ([db total_changes] - $x)>1 }
-} {0}
finish_test
projects / thirdparty / sqlite.git / commitdiff
