Avoid using the "direct overflow read" optimization to read large blobs if the

pager layer has a wal file open - even if the database header indicates that
the db is not a wal database.

FossilOrigin-Name: 63cfe19724b5856bd246c6fb98d3d79f8e022f71

diff --git a/ext/rbu/rbudor.test b/ext/rbu/rbudor.test
new file mode 100644 (file)
index 0000000..dcee7ac
--- /dev/null
+++ b/ext/rbu/rbudor.test
@@ -0,0 +1,59 @@
+# 2016 October 21
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+# This test file focuses on interactions between RBU and the feature
+# enabled by SQLITE_DIRECT_OVERFLOW_READ - Direct Overflow Read.
+#
+
+if {![info exists testdir]} {
+  set testdir [file join [file dirname [info script]] .. .. test]
+}
+source $testdir/tester.tcl
+set ::testprefix rbudor
+
+set bigA [string repeat a 5000]
+set bigB [string repeat b 5000]
+do_execsql_test 1.0 {
+  PRAGMA page_size = 1024;
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b BLOB);
+  INSERT INTO t1 VALUES(1, $bigA);
+} {}
+
+do_test 1.1 {
+  forcedelete rbu.db
+  sqlite3 rbu rbu.db 
+  rbu eval {
+    CREATE TABLE data_t1(a, b, rbu_control);
+    INSERT INTO data_t1 VALUES(2, $bigB, 0);
+  }
+  rbu close
+} {}
+
+do_test 1.2 {
+  sqlite3rbu rbu test.db rbu.db
+  while {[rbu state]!="checkpoint"} {
+    rbu step
+  }
+  rbu step
+  db eval { SELECT * FROM t1 }
+} [list 1 $bigA 2 $bigB]
+
+do_test 1.3 {
+  while {[rbu step]=="SQLITE_OK"} {}
+  rbu close
+} {SQLITE_DONE}
+
+do_execsql_test 1.4 {
+  SELECT * FROM t1 
+} [list 1 $bigA 2 $bigB]
+
+finish_test
+

diff --git a/manifest b/manifest
index 0dd2d2a72754193608d2b94ab656f36eb0b18243..5255d0939c813fb134cfd58255b68863363fe8cc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.15.0
-D 2016-10-14T10:20:30.806
+C Avoid\susing\sthe\s"direct\soverflow\sread"\soptimization\sto\sread\slarge\sblobs\sif\sthe\npager\slayer\shas\sa\swal\sfile\sopen\s-\seven\sif\sthe\sdatabase\sheader\sindicates\sthat\nthe\sdb\sis\snot\sa\swal\sdatabase.
+D 2016-11-03T18:30:26.454
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
@@ -247,6 +247,7 @@ F ext/rbu/rbuC.test efe47db508a0269b683cb2a1913a425ffd39a831
 F ext/rbu/rbu_common.tcl a38e8e2d4a50fd6aaf151633714c1b1d2fae3ead
 F ext/rbu/rbucrash.test 8d2ed5d4b05fef6c00c2a6b5f7ead71fa172a695
 F ext/rbu/rbudiff.test 3e605cf624d00d04d0fb1316a3acec4fbe3b3ac5
+F ext/rbu/rbudor.test 99b05cc0df613e962c2c8085cfb05686a09cf315
 F ext/rbu/rbufault.test cc0be8d5d392d98b0c2d6a51be377ea989250a89
 F ext/rbu/rbufault2.test 9a7f19edd6ea35c4c9f807d8a3db0a03a5670c06
 F ext/rbu/rbufault3.test 54a399888ac4af44c68f9f58afbed23149428bca
@@ -329,7 +330,7 @@ F src/auth.c 930b376a9c56998557367e6f7f8aaeac82a2a792
 F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
 F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
 F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
-F src/btree.c 7a45743fb947c89bd6c972bfb18c8f80c070ad51
+F src/btree.c 72965b023102daacc042443c707f4d415e88cbd7
 F src/btree.h d05b2fcc290991a8a3d9ea1816ddd55a4359dcde
 F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
 F src/build.c 59dcfdc1ee55439d069af301ef7f2e84421b5102
@@ -373,8 +374,8 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c be9ca0f901a2b6c1bc93dc338f4863675180c189
 F src/os_win.c 520f23475f1de530c435d30b67b7b15fe90874b0
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c bf5b71bde3e9b6110e7d6990607db881f6a471a2
-F src/pager.h 966d2769e76ae347c8a32c4165faf6e6cb64546d
+F src/pager.c b1ee3ec0e58a0f8ca090aec67b2d0c4d256d6bea
+F src/pager.h ec9140e5349491e561bb76aeac7a756f191191a1
 F src/parse.y 0338f906b61e311c2b7e11a3f89b0092c780b664
 F src/pcache.c 5ff2a08f76a9c1b22f43eb063b7068fb085465ac
 F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
@@ -1525,10 +1526,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4d66ac98deaa85218be7ff0eb254f78b96d8e8d4
-R a065c821855a0dd84a6e1c87c8d5ef05
-T +bgcolor * #d0c0ff
-T +sym-release *
-T +sym-version-3.15.0 *
+P 707875582fcba352b4906a595ad89198d84711d8
+Q +b54c15f11796a75683eec4b502a22ccb87d621c6
+R e2e39f14e79cce1d29a8ec843a0c0c77
+T *branch * branch-3.15
+T *sym-branch-3.15 *
+T -sym-trunk *
 U drh
-Z 64923968438b03dca07652ab710e8b24
+Z b8cce11b98de11457bc1316e68d1309a

diff --git a/manifest.uuid b/manifest.uuid
index a715a6572c70edee937e623d3857ae5f76f7233d..8f7542878e0ad454fcb2578a9ebfbfc46de299b5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-707875582fcba352b4906a595ad89198d84711d8
\ No newline at end of file
+63cfe19724b5856bd246c6fb98d3d79f8e022f71
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 3e8e59f3a3537ec92ea2380e6be8881260ce7ad5..ebffe6450cca4bc50105e066240407d0407b07df 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -4601,7 +4601,7 @@ static int accessPayload(
          && (bEnd || a==ovflSize)                              /* (6) */
          && pBt->inTransaction==TRANS_READ                     /* (4) */
          && (fd = sqlite3PagerFile(pBt->pPager))->pMethods     /* (3) */
-         && pBt->pPage1->aData[19]==0x01                       /* (5) */
+         && 0==sqlite3PagerUseWal(pBt->pPager)                 /* (5) */
          && &pBuf[-4]>=pBufStart                               /* (7) */
         ){
           u8 aSave[4];

diff --git a/src/pager.c b/src/pager.c
index dfa512b48561baa581da1111c8f2b7f395f65294..6f9a181969114f432c94ad2fbc7aef6edc648edd 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -817,9 +817,10 @@ static const unsigned char aJournalMagic[] = {
 ** rollback journal. Otherwise false.
 */
 #ifndef SQLITE_OMIT_WAL
-static int pagerUseWal(Pager *pPager){
+int sqlite3PagerUseWal(Pager *pPager){
   return (pPager->pWal!=0);
 }
+# define pagerUseWal(x) sqlite3PagerUseWal(x)
 #else
 # define pagerUseWal(x) 0
 # define pagerRollbackWal(x) 0

diff --git a/src/pager.h b/src/pager.h
index 1046670912de3dbef76eeb86901f123189f3b6a4..fe71fde50b8c61a4d145801a2ceaaa3f7df04b50 100644 (file)
--- a/src/pager.h
+++ b/src/pager.h
@@ -178,10 +178,13 @@ int sqlite3PagerSharedLock(Pager *pPager);
   int sqlite3PagerWalCallback(Pager *pPager);
   int sqlite3PagerOpenWal(Pager *pPager, int *pisOpen);
   int sqlite3PagerCloseWal(Pager *pPager);
+  int sqlite3PagerUseWal(Pager *pPager);
 # ifdef SQLITE_ENABLE_SNAPSHOT
   int sqlite3PagerSnapshotGet(Pager *pPager, sqlite3_snapshot **ppSnapshot);
   int sqlite3PagerSnapshotOpen(Pager *pPager, sqlite3_snapshot *pSnapshot);
 # endif
+#else
+# define sqlite3PagerUseWal(x) 0
 #endif
 
 #ifdef SQLITE_ENABLE_ZIPVFS