database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-05 15:55:57 +03:00
Code Activity

Once a temporary database file has been opened, flush all dirty pages to disk when comitting a transaction.

Browse Source 
FossilOrigin-Name: bbac71aa2aa2380d393cda3be64b0208b464b27e
This commit is contained in:
dan
2016-04-12 19:09:29 +00:00
parent 8a878f239c
commit 199f56b984
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Merge\senhancements\sfrom\strunk. C Once\sa\stemporary\sdatabase\sfile\shas\sbeen\sopened,\sflush\sall\sdirty\spages\sto\sdisk\swhen\scomitting\sa\stransaction.
D 2016-04-12T16:10:10.308 D 2016-04-12T19:09:29.339
F Makefile.in eba680121821b8a60940a81454316f47a341487a F Makefile.in eba680121821b8a60940a81454316f47a341487a
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
@@ -362,7 +362,7 @@ F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
F src/os_unix.c bde4844f0849cab5924c6a81178f8500774ce76b F src/os_unix.c bde4844f0849cab5924c6a81178f8500774ce76b
F src/os_win.c b3ba9573d8d893e70a6a8015bbee572ecf7ffbef F src/os_win.c b3ba9573d8d893e70a6a8015bbee572ecf7ffbef
F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
F src/pager.c 4cc8a5b3979db65725eaa03650a6d54219122b8d F src/pager.c 525f3698f9a6b47a6e0f5496675529a183c2462b
F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56 F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e
F src/pcache.c e9c00846d3dcdaa75b288c6f16238c2fe2177823 F src/pcache.c e9c00846d3dcdaa75b288c6f16238c2fe2177823
@@ -1484,7 +1484,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 04b1890fbc19eb3fa935083c1664fbbfb67dad93 7e7289655185e7643ead6d685922528bc4d9e0ae P 9682c0433c04713c28bd9105a7e20af7372f873e
R 5d35ce920fcfc7013551c54ce7d1cde0 R ade8e2f9d92ad43fcc4c6c4e5d1634ec
U drh U dan
Z 97342c74358cb773c29965a93119c3f8 Z 4a91ff9d1af5229ff41acb5284c79d70

2
manifest.uuid
View File

@@ -1 +1 @@
9682c0433c04713c28bd9105a7e20af7372f873e bbac71aa2aa2380d393cda3be64b0208b464b27e

7
src/pager.c
View File

@@ -2011,7 +2011,7 @@ static int pager_end_transaction(Pager *pPager, int hasMaster, int bCommit){
sqlite3BitvecDestroy(pPager->pInJournal); sqlite3BitvecDestroy(pPager->pInJournal);
pPager->pInJournal = 0; pPager->pInJournal = 0;
pPager->nRec = 0; pPager->nRec = 0;
if( pPager->tempFile==0 || MEMDB ){ if( isOpen(pPager->fd) || MEMDB ){
sqlite3PcacheCleanAll(pPager->pPCache); sqlite3PcacheCleanAll(pPager->pPCache);
}else{ }else{
sqlite3PcacheClearWritable(pPager->pPCache); sqlite3PcacheClearWritable(pPager->pPCache);
@@ -4273,7 +4273,7 @@ static int pager_write_pagelist(Pager *pPager, PgHdr *pList){
assert( !pagerUseWal(pPager) ); assert( !pagerUseWal(pPager) );
assert( pPager->tempFile || pPager->eState==PAGER_WRITER_DBMOD ); assert( pPager->tempFile || pPager->eState==PAGER_WRITER_DBMOD );
assert( pPager->eLock==EXCLUSIVE_LOCK ); assert( pPager->eLock==EXCLUSIVE_LOCK );
assert( pPager->tempFile==0 || pList->pDirty==0 ); assert( isOpen(pPager->fd) || pList->pDirty==0 );
/* If the file is a temp-file has not yet been opened, open it now. It /* If the file is a temp-file has not yet been opened, open it now. It
** is not possible for rc to be other than SQLITE_OK if this branch ** is not possible for rc to be other than SQLITE_OK if this branch
@@ -6195,7 +6195,8 @@ int sqlite3PagerCommitPhaseOne(
if( pPager->eState<PAGER_WRITER_CACHEMOD ) return SQLITE_OK; if( pPager->eState<PAGER_WRITER_CACHEMOD ) return SQLITE_OK;
assert( MEMDB==0 || pPager->tempFile ); assert( MEMDB==0 || pPager->tempFile );
if( pPager->tempFile ){ assert( isOpen(pPager->fd) || pPager->tempFile );
if( !isOpen(pPager->fd) ){
/* If this is an in-memory db, or no pages have been written to, or this /* If this is an in-memory db, or no pages have been written to, or this
** function has already been called, it is mostly a no-op. However, any ** function has already been called, it is mostly a no-op. However, any
** backup in progress needs to be restarted. */ ** backup in progress needs to be restarted. */