Update test cases to taken deferred statement-journal opening into account.

FossilOrigin-Name: 5b2fe5219ab9ad15969e3374894a75979b65cb3c

diff --git a/manifest b/manifest
index 58b8efaa399e67a4f19eb46f5619ce55d88ab1e6..b827dc21f1ee41192d27d83c21d39fee86dc05d0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\schanges\sfrom\strunk.
-D 2016-03-04T13:08:35.636
+C Update\stest\scases\sto\staken\sdeferred\sstatement-journal\sopening\sinto\saccount.
+D 2016-03-04T14:23:10.937
 F Makefile.in ead489fe5d3313b8a2a8d5f3710173a4b50dd2e0
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d68db8ddac21ea2576ea5b446f12cf9ebe897a03
@@ -541,8 +541,8 @@ F test/collate9.test 3adcc799229545940df2f25308dd1ad65869145a
 F test/collateA.test b8218ab90d1fa5c59dcf156efabb1b2599c580d6
 F test/colmeta.test 2c765ea61ee37bc43bbe6d6047f89004e6508eb1
 F test/colname.test 08948a4809d22817e0e5de89c7c0a8bd90cb551b
-F test/conflict.test 841bcf7cabbfca39c577eb8411ea8601843b46a8
-F test/conflict2.test a82dd3b9b41fceb5dd6ff0707c5c7ffba208d538
+F test/conflict.test 029faa2d81a0d1cafb5f88614beb663d972c01db
+F test/conflict2.test bb0b94cf7196c64a3cbd815c66d3ee98c2fecd9c
 F test/conflict3.test dec0634c0f31dec9a4b01c63063e939f0cd21b6b
 F test/contrib01.test 2a1cbc0f2f48955d7d073f725765da6fbceda6b4
 F test/corrupt.test 141c39ea650c1365e85a49e402fa05cb9617fb97
@@ -627,7 +627,7 @@ F test/enc4.test c8f1ce3618508fd0909945beb8b8831feef2c020
 F test/eqp.test 85873fa5816c48915c82c4e74cb5c35a5b48160f
 F test/errmsg.test f31592a594b44ee121371d25ddd5d63497bb3401
 F test/eval.test a64c9105d6ff163df7cf09d6ac29cdad5922078c
-F test/exclusive.test c7ebbc756eacf544c108b15eed64d7d4e5f86b75
+F test/exclusive.test f48243eaf40e0957215501a12f510a8644d13a02
 F test/exclusive2.test 32798111aae78a5deec980eee383213f189df308
 F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
 F test/exists.test 8f7b27b61c2fbe5822f0a1f899c715d14e416e30
@@ -1063,7 +1063,7 @@ F test/sqllimits1.test a74ee2a3740b9f9c2437c246d8fb77354862a142
 F test/sqllog.test 6af6cb0b09f4e44e1917e06ce85be7670302517a
 F test/stat.test acc91e80517fff447ae8adcfd953cfdaa5efc0af
 F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
-F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
+F test/stmt.test 64844332db69cf1a735fcb3e11548557fc95392f
 F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
 F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
 F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
@@ -1079,7 +1079,7 @@ F test/table.test b708f3e5fa2542fa51dfab21fc07b36ea445cb2f
 F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
 F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
 F test/tclsqlite.test 7fb866443c7deceed22b63948ccd6f76b52ad054
-F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
+F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6
 F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
 F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
 F test/tester.tcl 750365ff97047ded5f2d6e28df82a998f7c66ae0
@@ -1453,7 +1453,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P b5378dcea53d4cd1744d13ddee5e50869607b771 2682e8e413fadbca0673f242769af17bfd291559
-R 1d5f238c78a751f41b8ce4e327b6fc98
+P a87305dfd49ee17632d0bce66ce7c2e9407b7b3e
+R bcfeac6deb0b24b3190e8b427e406c58
 U drh
-Z 35e5851abb6d53f81aa001148a407eb0
+Z 82bd4288d2e4175a3c31e21a46f9d82d

diff --git a/manifest.uuid b/manifest.uuid
index 7ae252503c7a13b67817c28aa846d517a7c5e38e..5596275a8001e5cdf40b72ad32b46202c3781e94 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a87305dfd49ee17632d0bce66ce7c2e9407b7b3e
\ No newline at end of file
+5b2fe5219ab9ad15969e3374894a75979b65cb3c
\ No newline at end of file

diff --git a/test/conflict.test b/test/conflict.test
index af5668ed72fcb07ce85205cb681c0aad23722463..a39988adb033227c9222334e9e7c4f9cf53e7e04 100644 (file)
--- a/test/conflict.test
+++ b/test/conflict.test
@@ -285,15 +285,17 @@ do_test conflict-6.0 {
 #   t3     Number of temporary files for tables
 #   t4     Number of temporary files for statement journals
 #
-# Update: Since temporary table files are now opened lazily, and none
-# of the following tests use large quantities of data, t3 is always 0.
+# Update (2007-08-21): Since temporary table files are now opened lazily, 
+# and none of the following tests use large quantities of data, t3 is always 0.
+#
+# Update (2016-03-04): Subjournals now also open lazily, so t4 is also always 0.
 #
 foreach {i conf1 cmd t0 t1 t2 t3 t4} {
-  1 {}       UPDATE                  1 {6 7 8 9}  1 0 1
+  1 {}       UPDATE                  1 {6 7 8 9}  1 0 0
   2 REPLACE  UPDATE                  0 {7 6 9}    1 0 0
   3 IGNORE   UPDATE                  0 {6 7 3 9}  1 0 0
   4 FAIL     UPDATE                  1 {6 7 3 4}  1 0 0
-  5 ABORT    UPDATE                  1 {1 2 3 4}  1 0 1
+  5 ABORT    UPDATE                  1 {1 2 3 4}  1 0 0
   6 ROLLBACK UPDATE                  1 {1 2 3 4}  0 0 0
   7 REPLACE  {UPDATE OR IGNORE}      0 {6 7 3 9}  1 0 0
   8 IGNORE   {UPDATE OR REPLACE}     0 {7 6 9}    1 0 0
@@ -303,7 +305,7 @@ foreach {i conf1 cmd t0 t1 t2 t3 t4} {
  12 {}       {UPDATE OR IGNORE}      0 {6 7 3 9}  1 0 0
  13 {}       {UPDATE OR REPLACE}     0 {7 6 9}    1 0 0
  14 {}       {UPDATE OR FAIL}        1 {6 7 3 4}  1 0 0
- 15 {}       {UPDATE OR ABORT}       1 {1 2 3 4}  1 0 1
+ 15 {}       {UPDATE OR ABORT}       1 {1 2 3 4}  1 0 0
  16 {}       {UPDATE OR ROLLBACK}    1 {1 2 3 4}  0 0 0
 } {
   if {$t0} {set t1 {UNIQUE constraint failed: t1.a}}

diff --git a/test/conflict2.test b/test/conflict2.test
index 64969138493f5545c9570bef4870be471cadae9b..f33e01d582709fa584d919aa07487e8128a8dfde 100644 (file)
--- a/test/conflict2.test
+++ b/test/conflict2.test
@@ -287,22 +287,25 @@ do_test conflict2-6.0 {
 # Update: Since temporary table files are now opened lazily, and none
 # of the following tests use large quantities of data, t3 is always 0.
 #
+# Update (2016-03-04): Subjournals now only open when their size
+# exceeds 64KB.
+#
 foreach {i conf1 cmd t0 t1 t2 t3 t4} {
-  1 {}       UPDATE                  1 {6 7 8 9}  1 0 1
-  2 REPLACE  UPDATE                  0 {7 6 9}    1 0 1
-  3 IGNORE   UPDATE                  0 {6 7 3 9}  1 0 1
-  4 FAIL     UPDATE                  1 {6 7 3 4}  1 0 1
-  5 ABORT    UPDATE                  1 {1 2 3 4}  1 0 1
-  6 ROLLBACK UPDATE                  1 {1 2 3 4}  0 0 1
+  1 {}       UPDATE                  1 {6 7 8 9}  1 0 0
+  2 REPLACE  UPDATE                  0 {7 6 9}    1 0 0
+  3 IGNORE   UPDATE                  0 {6 7 3 9}  1 0 0
+  4 FAIL     UPDATE                  1 {6 7 3 4}  1 0 0
+  5 ABORT    UPDATE                  1 {1 2 3 4}  1 0 0
+  6 ROLLBACK UPDATE                  1 {1 2 3 4}  0 0 0
   7 REPLACE  {UPDATE OR IGNORE}      0 {6 7 3 9}  1 0 0
-  8 IGNORE   {UPDATE OR REPLACE}     0 {7 6 9}    1 0 1
+  8 IGNORE   {UPDATE OR REPLACE}     0 {7 6 9}    1 0 0
   9 FAIL     {UPDATE OR IGNORE}      0 {6 7 3 9}  1 0 0
- 10 ABORT    {UPDATE OR REPLACE}     0 {7 6 9}    1 0 1
+ 10 ABORT    {UPDATE OR REPLACE}     0 {7 6 9}    1 0 0
  11 ROLLBACK {UPDATE OR IGNORE}      0 {6 7 3 9}  1 0 0
  12 {}       {UPDATE OR IGNORE}      0 {6 7 3 9}  1 0 0
- 13 {}       {UPDATE OR REPLACE}     0 {7 6 9}    1 0 1
+ 13 {}       {UPDATE OR REPLACE}     0 {7 6 9}    1 0 0
  14 {}       {UPDATE OR FAIL}        1 {6 7 3 4}  1 0 0
- 15 {}       {UPDATE OR ABORT}       1 {1 2 3 4}  1 0 1
+ 15 {}       {UPDATE OR ABORT}       1 {1 2 3 4}  1 0 0
  16 {}       {UPDATE OR ROLLBACK}    1 {1 2 3 4}  0 0 0
 } {
 

diff --git a/test/exclusive.test b/test/exclusive.test
index c000dfefa4d803891d3259f58a7dc9fe2a87e336..c7b88cfbca55d5712597086802439dd985b9481b 100644 (file)
--- a/test/exclusive.test
+++ b/test/exclusive.test
@@ -420,9 +420,10 @@ do_test exclusive-5.0 {
 } {}
 do_test exclusive-5.1 {
   # Three files are open: The db, journal and statement-journal.
+  # (2016-03-04) The statement-journal is now opened lazily
   set sqlite_open_file_count
   expr $sqlite_open_file_count-$extrafds
-} [expr 3 - ($TEMP_STORE>=2)]
+} [expr 2 - ($TEMP_STORE>=2)]
 do_test exclusive-5.2 {
   execsql {
     COMMIT;
@@ -446,17 +447,19 @@ do_test exclusive-5.4 {
     INSERT INTO abc SELECT a+10, b+10, c+10 FROM abc;
   }
   # Three files are open: The db, journal and statement-journal.
+  # 2016-03-04: The statement-journal open is deferred
   set sqlite_open_file_count
   expr $sqlite_open_file_count-$extrafds
-} [expr 3 - ($TEMP_STORE>=2)]
+} [expr 2 - ($TEMP_STORE>=2)]
 do_test exclusive-5.5 {
   execsql {
     COMMIT;
   }
   # Three files are still open: The db, journal and statement-journal.
+  # 2016-03-04: The statement-journal open is deferred
   set sqlite_open_file_count
   expr $sqlite_open_file_count-$extrafds
-} [expr 3 - ($TEMP_STORE>=2)]
+} [expr 2 - ($TEMP_STORE>=2)]
 do_test exclusive-5.6 {
   execsql {
     PRAGMA locking_mode = normal;

diff --git a/test/stmt.test b/test/stmt.test
index 49a41414b779dc1f9cd113a5aaf9a4337d431bf2..df501f76547024eeffe778644242f2e06cc4669c 100644 (file)
--- a/test/stmt.test
+++ b/test/stmt.test
@@ -46,7 +46,8 @@ do_test stmt-1.4 {
     INSERT INTO t1 SELECT a+1, b+1 FROM t1;
   }
   set sqlite_open_file_count
-} {3}
+  # 2016-03-04: statement-journal open deferred
+} {2}
 do_test stmt-1.5 {
   execsql COMMIT
   set sqlite_open_file_count
@@ -61,7 +62,8 @@ do_test stmt-1.6.1 {
 do_test stmt-1.6.2 {
   execsql { INSERT INTO t1 SELECT a+4, b+4 FROM t1 }
   set sqlite_open_file_count
-} {3}
+  # 2016-03-04: statement-journal open deferred
+} {2}
 do_test stmt-1.7 {
   execsql COMMIT
   set sqlite_open_file_count
@@ -84,7 +86,7 @@ filecount stmt-2.3 { INSERT INTO t1 SELECT 9, 9   } 2
 filecount stmt-2.4 { 
     INSERT INTO t1 SELECT 9, 9;
     INSERT INTO t1 SELECT 10, 10;
-} 3
+} 2
 
 do_test stmt-2.5 {
   execsql { CREATE INDEX i1 ON t1(b) }
@@ -92,6 +94,6 @@ do_test stmt-2.5 {
 filecount stmt-2.6 { 
   REPLACE INTO t1 VALUES(5, 5);
   REPLACE INTO t1 VALUES(5, 5); 
-} 3
+} 2
 
 finish_test

diff --git a/test/tempdb.test b/test/tempdb.test
index ecd23d4e32866f437f953f1e3370013e4a8ed072..61416ec81c0cce1185f5eedd3e5dd26c4de3ce2d 100644 (file)
--- a/test/tempdb.test
+++ b/test/tempdb.test
@@ -76,7 +76,7 @@ do_test tempdb-2.2 {
   }
   catchsql { INSERT INTO t1 SELECT * FROM t2 }
   set sqlite_open_file_count
-} [expr 1 + (0==$jrnl_in_memory) + (0==$subj_in_memory)]
+} [expr 1 + (0==$jrnl_in_memory)]
 do_test tempdb-2.3 {
   execsql {
     PRAGMA temp_store = 'memory';