Fix issues with the io.test script. There is still a problem with a

ROLLBACK TO not working on an initially empty database files.  And much
more testing is needed.

FossilOrigin-Name: 09786e2a51817d572a01ae7f3621f03fd27fc363

diff --git a/manifest b/manifest
index 6bc092dab161d68c85f727b0f3ae042b2114406f..fad5d544d9e31f4ca875b4f3f979e91c141d7acb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Experimental\schanges\sthat\scause\sSQLite\sto\suse\sbytes\s28..31\sof\sthe\sdatabase\nheader\sto\sdetermine\sthe\sdatabase\ssize,\srather\sthan\susing\sthe\sactual\sdatabase\nsize.\s\sThis\sallows\sdatabase\sspace\sto\sbe\spreallocated.
-D 2010-03-27T17:12:36
+C Fix\sissues\swith\sthe\sio.test\sscript.\s\sThere\sis\sstill\sa\sproblem\swith\sa\nROLLBACK\sTO\snot\sworking\son\san\sinitially\sempty\sdatabase\sfiles.\s\sAnd\smuch\nmore\stesting\sis\sneeded.
+D 2010-03-29T19:36:52
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -112,7 +112,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c b293534bc2df23c57668a585b17ee7faaaef0939
 F src/bitvec.c 06ad2c36a9c3819c0b9cbffec7b15f58d5d834e0
 F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
-F src/btree.c 28c3975060209dc5c5ca91abaa5e034dab03539f
+F src/btree.c 6bb6cf7bed564d5a836888d49952d18991a8fe0d
 F src/btree.h 0e193b7e90f1d78b79c79474040e3d66a553a4fa
 F src/btreeInt.h 132d750db5d86b75344cec870501fa09a67b1f96
 F src/build.c 11100b66fb97638d2d874c1d34d8db90650bb1d7
@@ -447,7 +447,7 @@ F test/insert5.test 1f93cbe9742110119133d7e8e3ccfe6d7c249766
 F test/intarray.test 066b7d7ac38d25bf96f87f1b017bfc687551cdd4
 F test/interrupt.test 42e7cf98646fd9cb4a3b131a93ed3c50b9e149f1
 F test/intpkey.test 537669fd535f62632ca64828e435b9e54e8d677f
-F test/io.test e7bd58edb4e2131a8ecd81b4b00af3ee5c79d464
+F test/io.test 1b895d6774491895cbc75659969f07ca01860c88
 F test/ioerr.test 390785ec65f10aa58a82b048ee12e9052d783fa8
 F test/ioerr2.test 1b56cb80d5b0726ee3ba325ca175734541e32955
 F test/ioerr3.test d3cec5e1a11ad6d27527d0d38573fbff14c71bdd
@@ -797,18 +797,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 9e075e70f0e2a1ad302d17150cd58f91669a97a6
-R 8d4f88bef4d5dad0eb6446592a8450b9
-T *bgcolor * #c0ffc0
-T *branch * experimental
-T *sym-experimental *
-T -sym-trunk *
+P b844ac6fcb72595a71e5c5283ec461309a87ba79
+R a62dd4e3ab32e20d939eda838bfbb2f1
 U drh
-Z 4146840317f4bfa6058f588cd6ed7701
+Z 329f9cf3c013b023df41a7bffafbcabe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLrjyHoxKgR168RlERArtLAKCJtnFICZRpFQj18diXIg+u0uOi3ACgh4j0
-mhbXREy6ig+7NdEp5dlms38=
-=ITwY
+iD8DBQFLsQFXoxKgR168RlERArjwAJ9IAQ+b2v66KY2Sc5o+HExqkMOi4QCfYPzp
+xOxyx0MFrr6GJcUVrjEt7MQ=
+=YC1M
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 35e921ca955251b7d52cffde1f8f53e1318c0e9e..391a04f8c5bc09726a94ee134f7125bade9a6292 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b844ac6fcb72595a71e5c5283ec461309a87ba79
\ No newline at end of file
+09786e2a51817d572a01ae7f3621f03fd27fc363
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index b8c41674a285d655fe4b937deed710f758493ba8..1294e7d95a470ec4b5d82d656eaa9fc104fbcdd2 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -3232,17 +3232,13 @@ int sqlite3BtreeBeginStmt(Btree *p, int iStatement){
   assert( pBt->readOnly==0 );
   assert( iStatement>0 );
   assert( iStatement>p->db->nSavepoint );
-  if( NEVER(p->inTrans!=TRANS_WRITE || pBt->readOnly) ){
-    rc = SQLITE_INTERNAL;
-  }else{
-    assert( pBt->inTransaction==TRANS_WRITE );
-    /* At the pager level, a statement transaction is a savepoint with
-    ** an index greater than all savepoints created explicitly using
-    ** SQL statements. It is illegal to open, release or rollback any
-    ** such savepoints while the statement transaction savepoint is active.
-    */
-    rc = sqlite3PagerOpenSavepoint(pBt->pPager, iStatement);
-  }
+  assert( pBt->inTransaction==TRANS_WRITE );
+  /* At the pager level, a statement transaction is a savepoint with
+  ** an index greater than all savepoints created explicitly using
+  ** SQL statements. It is illegal to open, release or rollback any
+  ** such savepoints while the statement transaction savepoint is active.
+  */
+  rc = sqlite3PagerOpenSavepoint(pBt->pPager, iStatement);
   sqlite3BtreeLeave(p);
   return rc;
 }
@@ -4848,7 +4844,7 @@ static int allocateBtreePage(
       MemPage *pPg = 0;
       TRACE(("ALLOCATE: %d from end of file (pointer-map page)\n", pBt->nPage));
       assert( pBt->nPage!=PENDING_BYTE_PAGE(pBt) );
-      rc = btreeGetPage(pBt, pBt->nPage, &pPg, 0);
+      rc = btreeGetPage(pBt, pBt->nPage, &pPg, 1);
       if( rc==SQLITE_OK ){
         rc = sqlite3PagerWrite(pPg->pDbPage);
         releasePage(pPg);
@@ -4862,7 +4858,7 @@ static int allocateBtreePage(
     *pPgno = pBt->nPage;
 
     assert( *pPgno!=PENDING_BYTE_PAGE(pBt) );
-    rc = btreeGetPage(pBt, *pPgno, ppPage, 0);
+    rc = btreeGetPage(pBt, *pPgno, ppPage, 1);
     if( rc ) return rc;
     rc = sqlite3PagerWrite((*ppPage)->pDbPage);
     if( rc!=SQLITE_OK ){

diff --git a/test/io.test b/test/io.test
index 3848affd8ce9b52f23525176bdde105f35516950..0cc26eff4c22ec10b8d95c3e87101810ea61d27b 100644 (file)
--- a/test/io.test
+++ b/test/io.test
@@ -200,10 +200,16 @@ do_test io-2.5.3 {
 # journal file is not actually created until the 'COMMIT' statement
 # is executed.
 #
+# Changed 2010-03-27:  The size of the database is now stored in 
+# bytes 28..31 and so when a page is added to the database, page 1
+# is immediately modified and the journal file immediately comes into
+# existance.  To fix this test, the BEGIN is changed into a a
+# BEGIN IMMEDIATE and the INSERT is omitted.
+#
 do_test io-2.6.1 {
   execsql {
-    BEGIN;
-    INSERT INTO abc VALUES(9, randstr(1000,1000));
+    BEGIN IMMEDIATE;
+    -- INSERT INTO abc VALUES(9, randstr(1000,1000));
   }
   file exists test.db-journal
 } {0}
@@ -213,12 +219,15 @@ do_test io-2.6.2 {
   # should fail with SQLITE_CANTOPEN and the transaction rolled back.
   #
   file mkdir test.db-journal
-  catchsql { COMMIT }
+  catchsql {
+    INSERT INTO abc VALUES(9, randstr(1000,1000));
+    COMMIT
+  }
 } {1 {unable to open database file}}
 do_test io-2.6.3 {
   file delete -force test.db-journal
   catchsql { COMMIT }
-} {1 {cannot commit - no transaction is active}}
+} {0 {}}
 do_test io-2.6.4 {
   execsql { SELECT * FROM abc }
 } {1 2 3 4 5 6 7 8}