Add test cases to fts4merge.test.

FossilOrigin-Name: ecab2083334dcdde24a3c56864114979b7a6f25a

diff --git a/manifest b/manifest
index 7fb243a8e375c1391569db3219efe642a0188c9b..67f50b5a99780b41b971e714ee777144c84d1866 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Following\san\sincr-merge\soperation\sthat\sdoes\snot\scompletely\sconsume\sits\sinput\ssegments,\sstore\scontext\sin\sthe\srowid==1\srow\sof\sthe\s%_stat\stable\sthat\sallows\sthe\snext\sincr-merge\sto\spick\sup\swhere\sthe\sprevious\sleft\soff.
-D 2012-03-22T16:48:12.328
+C Add\stest\scases\sto\sfts4merge.test.
+D 2012-03-22T17:48:00.732
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -498,7 +498,7 @@ F test/fts3sort.test 95be0b19d7e41c44b29014f13ea8bddd495fd659
 F test/fts4aa.test 6e7f90420b837b2c685f3bcbe84c868492d40a68
 F test/fts4content.test 17b2360f7d1a9a7e5aa8022783f5c5731b6dfd4f
 F test/fts4langid.test 24a6e41063b416bbdf371ff6b4476fa41c194aa7
-F test/fts4merge.test 8e092654ab874afcc4a25f2255497eeb37da74e9
+F test/fts4merge.test 663607bef5575027295d0b7168370ccd0bae6522
 F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891
 F test/fts4merge3.test 2d2008772f45afc617fc34d10bcafbc8de1ca2ae
 F test/func.test 6c5ce11e3a0021ca3c0649234e2d4454c89110ca
@@ -996,7 +996,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 903ec5126dd981da6d7bab45c568f34b99446159
-R 36f0dde084aa3ea3b70c7d9b0328ed18
+P ab0a4f44fb67e9f0cb82297b80e728ca58cdb0fb
+R ad6c9794089ec45a4e493d1d79b6555f
 U dan
-Z c1efcc23c92abcdb78f85442afae1924
+Z 8189e23423b7ab0255c97e908b40cc3e

diff --git a/manifest.uuid b/manifest.uuid
index 2894e9a6a25d57ad9bcadf04295f2b89e391c5b9..cbb9ac7b02c5b84240b2c9569c5400d17ebe542f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ab0a4f44fb67e9f0cb82297b80e728ca58cdb0fb
\ No newline at end of file
+ecab2083334dcdde24a3c56864114979b7a6f25a
\ No newline at end of file

diff --git a/test/fts4merge.test b/test/fts4merge.test
index 91f3e04f8bcd8f9045024226f0886108e1fcc375..5d3368e5286e6899c97fef077b5f9aa71d41210f 100644 (file)
--- a/test/fts4merge.test
+++ b/test/fts4merge.test
@@ -162,5 +162,98 @@ do_execsql_test 4.4.2 {
   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,4');
+  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 3}
+}
+
+do_execsql_test 5.4 {SELECT quote(value) from t1_stat WHERE rowid=1} {X'0104'}
+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'0104'}
+
+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 11 12 13 14 15} 
+  1 {0 1 2 3 4 5 6 7 8 9 10 11} 
+  2 {0 1 2 3 4 5 6 7}
+  X'0104'
+}
+
+do_execsql_test 5.8 {
+  INSERT INTO t1(t1) VALUES('merge=1,4');
+  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 11 12 13 14 15} 
+  1 {0 1 2 3 4 5 6 7 8 9 10 11} 
+  2 {0 1 2 3 4 5 6 7}
+  3 {0}
+  X'0204'
+}
+
+do_test 5.9 {
+  set L [expr 16*16*8 + 16*4 + 1]
+  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   2 0   3 {0 1}
+  X'0204'
+}
+
+do_execsql_test 5.11 {
+  INSERT INTO t1(t1) VALUES('merge=10,4');
+  SELECT level, group_concat(idx, ' ') FROM t1_segdir GROUP BY level;
+  SELECT quote(value) from t1_stat WHERE rowid=1;
+} {
+  0 0   1 0   2 0   3 {0 1}
+  X'0000'
+}
+
 
 finish_test