Add codec support to wal mode.

FossilOrigin-Name: 393741eba353d5d242b8e3c96db3ea2b92228036

diff --git a/manifest b/manifest
index 49c2a3cc4c9d5cda9dc19e3319944c345d90254b..89e50e174d9c747989bd70a8e16d53fc7d4ab67a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C When\strying\sto\stransition\sfrom\sjournal_mode\sMEMORY\sto\sWAL,\suse\sOFF\sas\san\nintermediate\sjournal\smode.
-D 2010-06-22T14:49:40
+C Add\scodec\ssupport\sto\swal\smode.
+D 2010-06-22T15:18:44
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -159,8 +156,8 @@ F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 665876d5eec7585226b0a1cf5e18098de2b2da19
 F src/os_unix.c 5231a75a3799872b1250bc70c0e6a1a5960bc865
 F src/os_win.c 73608839342de32280cb378d3c2fc85a5dd80bd2
-F src/pager.c 3c269ecaabae139307448a99d08679ec9aab0aba
-F src/pager.h ca1f23c0cf137ac26f8908df2427c8b308361efd
+F src/pager.c 0517562e70c2a4bc2f3ff0762e4e19f94ed24c24
+F src/pager.h 051ed521fb0ecac631d60e9ad4b40b829639aabf
 F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
 F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07
 F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
@@ -229,7 +226,7 @@ F src/vdbeblob.c 258a6010ba7a82b72b327fb24c55790655689256
 F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
-F src/wal.c 4ea519e6d6680b2fb504268733c09df7c20ae823
+F src/wal.c dcc18b615711353f4ff872a9428e9a249427da93
 F src/wal.h 4ace25262452d17e7d3ec970c89ee17794004008
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 1c895bef33d0dfc7ed90fb1f74120435d210ea56
@@ -488,7 +485,7 @@ F test/lock4.test c82268c031d39345d05efa672f80b025481b3ae5
 F test/lock5.test 6b1f78f09ad1522843dad571b76b321e6f439bf7
 F test/lock6.test 8df56060f396151777390982422c800d026e1722
 F test/lock7.test 64006c84c1c616657e237c7ad6532b765611cf64
-F test/lock_common.tcl a3cebc3de03a2bffe1fb02843ccaabeb7b263874
+F test/lock_common.tcl e7013c6208f5fa818735c324eb0249b4c0f317cf
 F test/lookaside.test 1dd350dc6dff015c47c07fcc5a727a72fc5bae02
 F test/main.test 2be2352ac77ac5b238c6337a5469aeeef57677e6
 F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
@@ -772,8 +769,8 @@ F test/vtabE.test 7c4693638d7797ce2eda17af74292b97e705cc61
 F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
 F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
-F test/wal.test 621a61aeec0fb43a4012ad8774a09ad00a692ea0
-F test/wal2.test fac65993f633e1ecc17db124a72c30707404d1a0
+F test/wal.test 55c3fae8a03437d52518e61ef115544fac108582
+F test/wal2.test 7ea1426f71fd29566ec8be818f3c2681125dd462
 F test/wal3.test bb3bc0be06411c2d147c1d1d636b6208fbe0349d
 F test/wal_common.tcl 3e953ae60919281688ea73e4d0aa0e1bc94becd9
 F test/walbak.test e7650a26eb4b8abeca9b145b1af1e63026dde432
@@ -828,14 +825,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 85dd51a75c75b2a123744f646e04538e4e5d89b3
-R 5187a667a2f982bcc127f4eb79a46f4d
-U drh
-Z a66a2fcdf8ebb147f6f17490b97d943d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFMIM2IoxKgR168RlERAvClAJ4w+nEzZOGGveDZxn4kNKnrISQYLQCfSwak
-b1gUNaLhd+E4LdRSHkfuC7I=
-=xvI6
------END PGP SIGNATURE-----
+P 4775b8f9a9d9b66fcd5abf3af111fcad249e662e
+R 2ecd2087dd0de003ea8ae917ed134748
+U dan
+Z f5174ae54201a5e81880758a2f3085e2

diff --git a/manifest.uuid b/manifest.uuid
index 5fd34cf6fdbe46e12e423412f712c7d592e1dee2..8926e863e389b64fb2eb91f9e77809d4edd74189 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4775b8f9a9d9b66fcd5abf3af111fcad249e662e
\ No newline at end of file
+393741eba353d5d242b8e3c96db3ea2b92228036
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index cba24b39a551d276b0f40e5f3d76a953b0b2eced..cf0a0643d732c931b897437f35c3dc9acec5f817 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -6101,6 +6101,22 @@ int sqlite3PagerCloseWal(Pager *pPager){
   }
   return rc;
 }
+
+#ifdef SQLITE_HAS_CODEC
+/*
+** This function is called by the wal module when writing page content
+** into the log file.
+**
+** This function returns a pointer to a buffer containing the encrypted
+** page content. If a malloc fails, this function may return NULL.
+*/
+void *sqlite3PagerCodec(PgHdr *pPg){
+  void *aData = 0;
+  CODEC2(pPg->pPager, pPg->pData, pPg->pgno, 6, return 0, aData);
+  return aData;
+}
+#endif
+
 #endif
 
 #endif /* SQLITE_OMIT_DISKIO */

diff --git a/src/pager.h b/src/pager.h
index 9f77cde079739f1db8383968b22f2caf54047583..f45049ade70c1fab55219a31ed88522e06e1d1c9 100644 (file)
--- a/src/pager.h
+++ b/src/pager.h
@@ -157,6 +157,12 @@ int sqlite3PagerIsMemdb(Pager*);
 /* Functions used to truncate the database file. */
 void sqlite3PagerTruncateImage(Pager*,Pgno);
 
+#if defined(SQLITE_HAS_CODEC) && !defined(SQLITE_OMIT_WAL)
+void *sqlite3PagerCodec(DbPage *);
+#else
+#define sqlite3PagerCodec(x) (x->pData)
+#endif
+
 /* Functions to support testing and debugging. */
 #if !defined(NDEBUG) || defined(SQLITE_TEST)
   Pgno sqlite3PagerPagenumber(DbPage*);

diff --git a/src/wal.c b/src/wal.c
index 64481c0dc19f9dd35ab9df60f6163e6de0d682b3..460df4e3e51f4c0296da881adbffcca98c73ac47 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -2286,19 +2286,22 @@ int sqlite3WalFrames(
   for(p=pList; p; p=p->pDirty){
     u32 nDbsize;                  /* Db-size field for frame header */
     i64 iOffset;                  /* Write offset in log file */
-
+    void *pData;
+   
+   
     iOffset = walFrameOffset(++iFrame, szPage);
     
     /* Populate and write the frame header */
     nDbsize = (isCommit && p->pDirty==0) ? nTruncate : 0;
-    walEncodeFrame(pWal, p->pgno, nDbsize, p->pData, aFrame);
+    if( (pData = sqlite3PagerCodec(p))==0 ) return SQLITE_NOMEM;
+    walEncodeFrame(pWal, p->pgno, nDbsize, pData, aFrame);
     rc = sqlite3OsWrite(pWal->pWalFd, aFrame, sizeof(aFrame), iOffset);
     if( rc!=SQLITE_OK ){
       return rc;
     }
 
     /* Write the page data */
-    rc = sqlite3OsWrite(pWal->pWalFd, p->pData, szPage, iOffset+sizeof(aFrame));
+    rc = sqlite3OsWrite(pWal->pWalFd, pData, szPage, iOffset+sizeof(aFrame));
     if( rc!=SQLITE_OK ){
       return rc;
     }
@@ -2315,14 +2318,15 @@ int sqlite3WalFrames(
 
     iSegment = (((iOffset+iSegment-1)/iSegment) * iSegment);
     while( iOffset<iSegment ){
-      walEncodeFrame(pWal, pLast->pgno, nTruncate, pLast->pData, aFrame);
+      void *pData;
+      if( (pData = sqlite3PagerCodec(pLast))==0 ) return SQLITE_NOMEM;
+      walEncodeFrame(pWal, pLast->pgno, nTruncate, pData, aFrame);
       rc = sqlite3OsWrite(pWal->pWalFd, aFrame, sizeof(aFrame), iOffset);
       if( rc!=SQLITE_OK ){
         return rc;
       }
-
       iOffset += WAL_FRAME_HDRSIZE;
-      rc = sqlite3OsWrite(pWal->pWalFd, pLast->pData, szPage, iOffset); 
+      rc = sqlite3OsWrite(pWal->pWalFd, pData, szPage, iOffset); 
       if( rc!=SQLITE_OK ){
         return rc;
       }

diff --git a/test/lock_common.tcl b/test/lock_common.tcl
index 40cecb9615e4bb7a36322e49e120689295e826f2..4fe08e0882f54a0c3c50a686121b12aaf93be576 100644 (file)
--- a/test/lock_common.tcl
+++ b/test/lock_common.tcl
@@ -13,8 +13,6 @@
 # processes) to test locking.
 #
 
-do_not_use_codec
-
 proc do_multiclient_test {varname script} {
 
   foreach code [list {
@@ -66,6 +64,7 @@ proc do_multiclient_test {varname script} {
 # 'testfixture' to execute a command. The child testfixture process is shut
 # down by closing the channel.
 proc launch_testfixture {} {
+  write_main_loop
   set prg [info nameofexec]
   if {$prg eq ""} {
     set prg [file join . testfixture]
@@ -130,27 +129,38 @@ proc testfixture_nb {varname cmd} {
 # process, followed by the word "OVER" on a line of its own. The child
 # process evaluates the script and writes the results to stdout, followed
 # by an "OVER" of its own.
-set f [open tf_main.tcl w]
-puts $f {
-  set l [open log w]
-  set script ""
-  while {![eof stdin]} {
-    flush stdout
-    set line [gets stdin]
-    puts $l "READ $line"
-    if { $line == "OVER" } {
-      set rc [catch {eval $script} result]
-      puts [list $rc $result]
-      puts $l "WRITE [list $rc $result]"
-      puts OVER
-      puts $l "WRITE OVER"
+#
+set main_loop_written 0
+proc write_main_loop {} {
+  if {$::main_loop_written} return
+  set wrapper ""
+  if {[sqlite3 -has-codec] && [info exists ::do_not_use_codec]==0} {
+    set wrapper "
+      rename sqlite3 sqlite_orig
+      proc sqlite3 {args} {[info body sqlite3]}
+    "
+  }
+
+  set fd [open tf_main.tcl w]
+  puts $fd [string map [list %WRAPPER% $wrapper] {
+    %WRAPPER%
+    set script ""
+    while {![eof stdin]} {
       flush stdout
-      set script ""
-    } else {
-      append script $line
-      append script "\n"
+      set line [gets stdin]
+      if { $line == "OVER" } {
+        set rc [catch {eval $script} result]
+        puts [list $rc $result]
+        puts OVER
+        flush stdout
+        set script ""
+      } else {
+        append script $line
+        append script "\n"
+      }
     }
-  }
-  close $l
+  }]
+  close $fd
+  set main_loop_written 1
 }
-close $f
+

diff --git a/test/wal.test b/test/wal.test
index 73960fe6e4f7fc2e595876c3d3993ef4bbeb7608..b7a026efe26d70222b4ec4a7c391fd0f93a5499d 100644 (file)
--- a/test/wal.test
+++ b/test/wal.test
@@ -18,11 +18,6 @@ source $testdir/tester.tcl
 source $testdir/lock_common.tcl
 source $testdir/malloc_common.tcl
 
-# Do not use a codec for tests in this file, as the database file is
-# manipulated directly using tcl scripts (using the [hexio_write] command).
-#
-do_not_use_codec
-
 ifcapable !wal {finish_test ; return }
 
 proc reopen_db {} {

diff --git a/test/wal2.test b/test/wal2.test
index 3f0beced227e4d2272cce28cee58c97804dbfedd..447ac109a4bf77906286dc81cc1ca211c34d4ae4 100644 (file)
--- a/test/wal2.test
+++ b/test/wal2.test
@@ -18,11 +18,6 @@ source $testdir/tester.tcl
 source $testdir/lock_common.tcl
 ifcapable !wal {finish_test ; return }
 
-# Do not use a codec for tests in this file, as the database file is
-# manipulated directly using tcl scripts (using the [hexio_write] command).
-#
-do_not_use_codec
-
 proc set_tvfs_hdr {file args} {
 
   # Set $nHdr to the number of bytes in the wal-index header:
@@ -807,9 +802,9 @@ do_test wal2-8.1.2 {
   }
   execsql {
     PRAGMA wal_checkpoint;
-    SELECT rootpage FROM sqlite_master WHERE tbl_name = 't2';
+    SELECT rootpage>=8192 FROM sqlite_master WHERE tbl_name = 't2';
   }
-} {8192}
+} {1}
 do_test wal2-8.1.3 {
   execsql {
     PRAGMA cache_size = 10;