mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If the user has not set it explicitly, set the "PRAGMA synchronous" setting to

Browse Source 
SQLITE_DEFAULT_SYNCHRONOUS when a database connection changes from wal to
rollback journal mode.

FossilOrigin-Name: 78030c0f52aa39fb2ab32c75c56e6bcefe6382b8df28b1909e3c911e42dbeca3
This commit is contained in:
dan 2017-03-16 18:14:39 +00:00
parent b30574bcae
commit f5da7dbb07
6 changed files with 200 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifest
View File

@ -1,5 +1,5 @@
C Simplified\sOOM\sdetection\sin\sthe\sinstr()\sSQL\sfunction.
D 2017-03-16T14:28:52.423
C If\sthe\suser\shas\snot\sset\sit\sexplicitly,\sset\sthe\s"PRAGMA\ssynchronous"\ssetting\sto\nSQLITE_DEFAULT_SYNCHRONOUS\swhen\sa\sdatabase\sconnection\schanges\sfrom\swal\sto\nrollback\sjournal\smode.
D 2017-03-16T18:14:39.798
F Makefile.in 9605f4c49eace601d5c12c85dd6e037cc613a6d823e857614ba26b42f1285db0
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 1faf9f06aadc9284c212dea7bbc7c0dea7e8337f0287c81001eff500912c790a
@ -343,13 +343,13 @@ F src/auth.c 930b376a9c56998557367e6f7f8aaeac82a2a792
F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
F src/btree.c e2bae0a03f73d119910fb35c9550987564065137
F src/btree.c ace24955d01800acec28c79b038e1c291370f48a8955e8347cbd5339e39935de
F src/btree.h bf64dfeeddeebdb775a5eba0098bbc00d073290d
F src/btreeInt.h cd55d39d9916270837a88c12e701047cba0729b0
F src/build.c 43f903c9082040ced2b421543cb0300c2973647d
F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
F src/ctime.c a9984df73898c042a5cfc8f9d8e7723d02bc35c9
F src/ctime.c 47d91a25ad8f199a71a5b1b7b169d6dd0d6e98c5719eca801568798743d1161c
F src/date.c ee676e7694dfadbdd2fde1a258a71be8360ba5ae
F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
F src/delete.c 0d9d5549d42e79ce4d82ff1db1e6c81e36d2f67c
@ -425,7 +425,7 @@ F src/test_backup.c bf5da90c9926df0a4b941f2d92825a01bbe090a0
F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96
F src/test_blob.c f65ac717da2618691cf9dad094e6da0219dcd208
F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
F src/test_config.c 83179ea845479b5be9a651d014649e3f2722a1fe
F src/test_config.c edcba290248dc18736dd814c9b95863c6762e0b35753048d8cbe5bf65f7abfbb
F src/test_delete.c af7eab5702f853fb1c62a5f7665e2234cf1ae17b
F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
@ -1165,6 +1165,7 @@ F test/subtype1.test 7fe09496352f97053af1437150751be2d0a0cae8
F test/superlock.test ec94f0556b6488d97f71c79f9061ae08d9ab8f12
F test/symlink.test c9ebe7330d228249e447038276bfc8a7b22f4849
F test/sync.test 2f84bdbc2b2df1fcb0220575b4b9f8cea94b7529
F test/sync2.test 5ecf56be4c187a191253a1ec0786fe2df975dbf3dc0f0140cdf5d3690c90651c
F test/syscall.test f59ba4e25f7ba4a4c031026cc2ef8b6e4b4c639c
F test/sysfault.test c9f2b0d8d677558f74de750c75e12a5454719d04
F test/tabfunc01.test 699251cb99651415218a891384510a685c7ab012
@ -1565,7 +1566,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 e3d487162d1596ce125644f754ed9531ef4412f31f6837c3e31b7542b90602fe
R 6130240157d02268edef1462c36002d9
U drh
Z 5ff31e1a870d72447c943f18c5a0c832
P 6d85eb5736781b43aa674d9544c7523b849b4e634f371702f8764b33e22e1e9f
R 549202c1b901efe7d78e47bd0d1adc7f
U dan
Z 959d77178fc349b2ba7589eca45f1aa2

2
manifest.uuid
View File

@ -1 +1 @@
6d85eb5736781b43aa674d9544c7523b849b4e634f371702f8764b33e22e1e9f
78030c0f52aa39fb2ab32c75c56e6bcefe6382b8df28b1909e3c911e42dbeca3

42
src/btree.c
View File

@ -2861,6 +2861,31 @@ int sqlite3BtreeGetAutoVacuum(Btree *p){
#endif
}
/*
** If the user has not set the safety-level for this database connection
** using "PRAGMA synchronous", and if the safety-level is not already
** set to the value passed to this function as the second parameter,
** set it so.
*/
#if SQLITE_DEFAULT_SYNCHRONOUS!=SQLITE_DEFAULT_WAL_SYNCHRONOUS
static void setDefaultSyncFlag(BtShared *pBt, u8 safety_level){
sqlite3 *db;
Db *pDb;
if( (db=pBt->db)!=0 && (pDb=db->aDb)!=0 ){
while( pDb->pBt==0 || pDb->pBt->pBt!=pBt ){ pDb++; }
if( pDb->bSyncSet==0
&& pDb->safety_level!=safety_level
&& pDb!=&db->aDb[1]
){
pDb->safety_level = safety_level;
sqlite3PagerSetFlags(pBt->pPager,
pDb->safety_level | (db->flags & PAGER_FLAGS_MASK));
}
}
}
#else
# define setDefaultSyncFlag(pBt)
#endif
/*
** Get a reference to pPage1 of the database file. This will
@ -2934,26 +2959,15 @@ static int lockBtree(BtShared *pBt){
if( rc!=SQLITE_OK ){
goto page1_init_failed;
}else{
#if SQLITE_DEFAULT_SYNCHRONOUS!=SQLITE_DEFAULT_WAL_SYNCHRONOUS
sqlite3 *db;
Db *pDb;
if( (db=pBt->db)!=0 && (pDb=db->aDb)!=0 ){
while( pDb->pBt==0 || pDb->pBt->pBt!=pBt ){ pDb++; }
if( pDb->bSyncSet==0
&& pDb->safety_level==SQLITE_DEFAULT_SYNCHRONOUS+1
){
pDb->safety_level = SQLITE_DEFAULT_WAL_SYNCHRONOUS+1;
sqlite3PagerSetFlags(pBt->pPager,
pDb->safety_level | (db->flags & PAGER_FLAGS_MASK));
}
}
#endif
setDefaultSyncFlag(pBt, SQLITE_DEFAULT_WAL_SYNCHRONOUS+1);
if( isOpen==0 ){
releasePage(pPage1);
return SQLITE_OK;
}
}
rc = SQLITE_NOTADB;
}else{
setDefaultSyncFlag(pBt, SQLITE_DEFAULT_SYNCHRONOUS+1);
}
#endif

6
src/ctime.c
View File

@ -66,6 +66,12 @@ static const char * const azCompileOpt[] = {
#if defined(SQLITE_DEFAULT_MMAP_SIZE) && !defined(SQLITE_DEFAULT_MMAP_SIZE_xc)
"DEFAULT_MMAP_SIZE=" CTIMEOPT_VAL(SQLITE_DEFAULT_MMAP_SIZE),
#endif
#if SQLITE_DEFAULT_SYNCHRONOUS
"DEFAULT_SYNCHRONOUS=" CTIMEOPT_VAL(SQLITE_DEFAULT_SYNCHRONOUS),
#endif
#if SQLITE_DEFAULT_WAL_SYNCHRONOUS
"DEFAULT_WAL_SYNCHRONOUS=" CTIMEOPT_VAL(SQLITE_DEFAULT_WAL_SYNCHRONOUS),
#endif
#if SQLITE_DIRECT_OVERFLOW_READ
"DIRECT_OVERFLOW_READ",
#endif

2
src/test_config.c
View File

@ -740,6 +740,8 @@ Tcl_SetVar2(interp, "sqlite_options", "mergesort", "1", TCL_GLOBAL_ONLY);
LINKVAR( DEFAULT_CACHE_SIZE );
LINKVAR( DEFAULT_PAGE_SIZE );
LINKVAR( DEFAULT_FILE_FORMAT );
LINKVAR( DEFAULT_SYNCHRONOUS );
LINKVAR( DEFAULT_WAL_SYNCHRONOUS );
LINKVAR( MAX_ATTACHED );
LINKVAR( MAX_DEFAULT_PAGE_SIZE );
LINKVAR( MAX_WORKER_THREADS );

153
test/sync2.test Normal file
View File

@ -0,0 +1,153 @@
# 2017 March 16
#
# 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 file implements regression tests for SQLite library.
#
# Specificly, it tests that "PRAGMA synchronous" appears to work.
#
set testdir [file dirname $argv0]
source $testdir/tester.tcl
set testprefix sync2
#
# These tests are only applicable when pager pragma are
# enabled. Also, since every test uses an ATTACHed database, they
# are only run when ATTACH is enabled.
#
ifcapable !pager_pragmas||!attach {
finish_test
return
}
proc execsql_sync {sql} {
set s $::sqlite_sync_count
set res [execsql $sql]
concat [expr $::sqlite_sync_count-$s] $res
}
proc do_execsql_sync_test {tn sql res} {
uplevel [list do_test $tn [list execsql_sync $sql] [list {*}$res]]
}
#-----------------------------------------------------------------------
# Tests for journal mode.
#
sqlite3 db test.db
do_execsql_test 1.0 {
CREATE TABLE t1(a, b);
INSERT INTO t1 VALUES(1, 2);
}
do_execsql_sync_test 1.1 { INSERT INTO t1 VALUES(3, 4) } 4
# synchronous=normal. So, 1 sync on the directory, 1 on the journal, 1
# on the db file. 3 in total.
do_execsql_test 1.2.1 { PRAGMA main.synchronous = NORMAL }
do_execsql_test 1.2.2 { PRAGMA main.synchronous } 1
do_execsql_sync_test 1.2.3 { INSERT INTO t1 VALUES(5, 6) } 3
# synchronous=off. No syncs.
do_execsql_test 1.3.1 { PRAGMA main.synchronous = OFF }
do_execsql_test 1.3.2 { PRAGMA main.synchronous } 0
do_execsql_sync_test 1.3.3 { INSERT INTO t1 VALUES(7, 8) } 0
# synchronous=full, journal_mode=delete. So, 1 sync on the directory,
# 2 on the journal, 1 on the db file. 4 in total.
do_execsql_test 1.4.1 { PRAGMA main.synchronous = FULL }
do_execsql_test 1.4.2 { PRAGMA main.synchronous } 2
do_execsql_sync_test 1.4.3 { INSERT INTO t1 VALUES(9, 10) } 4
#-----------------------------------------------------------------------
# Tests for wal mode.
#
do_execsql_test 1.5 { PRAGMA journal_mode = wal } {wal}
# sync=full, journal_mode=wal. One sync on the directory, two on the
# wal file.
do_execsql_sync_test 1.6 { INSERT INTO t1 VALUES(11, 12) } 3
# One sync on the wal file.
do_execsql_sync_test 1.7 { INSERT INTO t1 VALUES(13, 14) } 1
# No syncs.
do_execsql_test 1.8.1 { PRAGMA main.synchronous = NORMAL }
do_execsql_test 1.8.2 { PRAGMA main.synchronous } 1
do_execsql_sync_test 1.8.3 { INSERT INTO t1 VALUES(15, 16) } 0
# One sync on wal file, one on the db file.
do_execsql_sync_test 1.9 { PRAGMA wal_checkpoint } {2 0 3 3}
# No syncs.
do_execsql_test 1.10.1 { PRAGMA main.synchronous = OFF }
do_execsql_test 1.10.2 { PRAGMA main.synchronous } 0
do_execsql_sync_test 1.10.3 { INSERT INTO t1 VALUES(17, 18) } 0
#-----------------------------------------------------------------------
# Tests for the compile time settings SQLITE_DEFAULT_SYNCHRONOUS and
# SQLITE_DEFAULT_WAL_SYNCHRONOUS. These tests only run if the former
# is set to "2" and the latter to "1". This is not the default, but
# it is currently the recommended configuration.
#
# https://sqlite.org/compile.html#recommended_compile_time_options
#
if {$SQLITE_DEFAULT_SYNCHRONOUS==2 && $SQLITE_DEFAULT_WAL_SYNCHRONOUS==1} {
db close
sqlite3 db test.db
# Wal mode, sync=normal. The first transaction does one sync on directory,
# one on the wal file. The second does no syncs.
do_execsql_sync_test 1.11.1 { INSERT INTO t1 VALUES(19, 20) } 2
do_execsql_sync_test 1.11.2 { INSERT INTO t1 VALUES(21, 22) } 0
do_execsql_test 1.11.3 { PRAGMA main.synchronous } 1
# One sync on wal file, one on the db file.
do_execsql_sync_test 1.12 { PRAGMA wal_checkpoint } {2 0 2 2}
# First transaction syncs the wal file once, the second not at all.
# one on the wal file. The second does no syncs.
do_execsql_sync_test 1.13.1 { INSERT INTO t1 VALUES(22, 23) } 1
do_execsql_sync_test 1.13.2 { INSERT INTO t1 VALUES(24, 25) } 0
do_execsql_test 1.14 { PRAGMA journal_mode = delete } {delete}
# Delete mode, sync=full. The first transaction does one sync on
# directory, two on the journal file, one on the db. The second does
# the same.
do_execsql_sync_test 1.15.1 { INSERT INTO t1 VALUES(26, 27) } 4
do_execsql_sync_test 1.15.2 { INSERT INTO t1 VALUES(28, 29) } 4
do_execsql_test 1.15.3 { PRAGMA main.synchronous } 2
# Switch back to wal mode.
do_execsql_test 1.16 { PRAGMA journal_mode = wal } {wal}
do_execsql_sync_test 1.17.1 { INSERT INTO t1 VALUES(30, 31) } 2
do_execsql_sync_test 1.17.2 { INSERT INTO t1 VALUES(32, 33) } 0
do_execsql_test 1.17.3 { PRAGMA main.synchronous } 1
# Now set synchronous=off, then switch back to delete mode. Check
# that the db handle is still using synchronous=off.
do_execsql_test 1.18.3 { PRAGMA main.synchronous=off }
do_execsql_test 1.18 { PRAGMA journal_mode = delete } {delete}
do_execsql_sync_test 1.19.1 { INSERT INTO t1 VALUES(34, 35) } 0
do_execsql_sync_test 1.19.2 { INSERT INTO t1 VALUES(36, 37) } 0
do_execsql_test 1.19.3 { PRAGMA main.synchronous } 0
# Close and reopen the db. Back to synchronous=normal.
db close
sqlite3 db test.db
do_execsql_sync_test 1.20.1 { INSERT INTO t1 VALUES(38, 39) } 4
do_execsql_sync_test 1.20.2 { INSERT INTO t1 VALUES(40, 41) } 4
do_execsql_test 1.20.3 { PRAGMA main.synchronous } 2
}
finish_test