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

Remove a branch made redundant by the earlier exclusive-mode changes.

Browse Source 
FossilOrigin-Name: c501b2ede6aad123bef0aa7ce8b356a134eb6d26
This commit is contained in:
dan
2010-05-12 06:54:31 +00:00
parent 97c1f6c8f2
commit ed36020daf
4 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/wal.c
View File

@@ -1216,7 +1216,7 @@ void sqlite3WalDbsize(Wal *pWal, Pgno *pPgno){
int sqlite3WalWriteLock(Wal *pWal, int op){
int rc = SQLITE_OK;
if( op ){
assert( pWal->lockState == SQLITE_SHM_READ );
assert( pWal->lockState==SQLITE_SHM_READ );
rc = walSetLock(pWal, SQLITE_SHM_WRITE);
/* If this connection is not reading the most recent database snapshot,
@@ -1457,13 +1457,17 @@ int sqlite3WalCheckpoint(
assert( pWal->pWiData==0 );
/* Get the CHECKPOINT lock */
if( pWal->lockState!=SQLITE_SHM_UNLOCK ){
/* This can occur when locking_mode=EXCLUSIVE */
assert( pWal->lockState==SQLITE_SHM_READ
|| pWal->lockState==SQLITE_SHM_READ_FULL );
walSetLock(pWal, SQLITE_SHM_UNLOCK);
}
/* Get the CHECKPOINT lock.
**
** Normally, the connection will be in UNLOCK state at this point. But
** if the connection is in exclusive-mode it may still be in READ state
** even though the upper layer has no active read-transaction (because
** WalCloseSnapshot() is not called in exclusive mode). The state will
** be set to UNLOCK when this function returns. This is Ok.
*/
assert( (pWal->lockState==SQLITE_SHM_UNLOCK)
|| (pWal->exclusiveMode && pWal->lockState==SQLITE_SHM_READ)
);
do {
rc = walSetLock(pWal, SQLITE_SHM_CHECKPOINT);
}while( rc==SQLITE_BUSY && xBusyHandler(pBusyHandlerArg) );