database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-15 11:41:13 +03:00
Code Activity

If a commit fails due to lock contention right after the COMMIT command, take

Browse Source 
the database back out of autocommit mode.  Do not rollback.  This gives the
user the chance to try the COMMIT again. (CVS 1551)

FossilOrigin-Name: 39b4ba95c4a16b28b5e8c7a3331e09cb5796e258
This commit is contained in:
drh
2004-06-09 21:01:11 +00:00
parent c9e0686ead
commit ff13c7d6a3
6 changed files with 53 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vdbeaux.c
View File

@@ -971,7 +971,7 @@ static int vdbeCommit(sqlite *db){
u32 random;
sqliteFree(zMaster);
sqlite3Randomness(sizeof(random), &random);
zMaster = sqlite3MPrintf("%s-mj%08X", zMainFile, random);
zMaster = sqlite3MPrintf("%s-mj%08X", zMainFile, random&0x7fffffff);
if( !zMaster ){
return SQLITE_NOMEM;
}
@@ -1134,7 +1134,18 @@ int sqlite3VdbeReset(Vdbe *p, char **pzErrMsg){
p->rc = vdbeCommit(db);
if( p->rc!=SQLITE_OK ){
sqlite3Error(p->db, p->rc, 0);
xFunc = sqlite3BtreeRollback;
if( p->rc==SQLITE_BUSY && p->autoCommitOn ){
/* If we just now have turned autocommit on (meaning we just have
** finished executing a COMMIT command) but the commit fails due
** to lock contention, autocommit back off. This gives the user
** the opportunity to try again after the lock that was preventing
** the commit has cleared. */
db->autoCommit = 0;
}else{
/* If the command just executed was not a COMMIT command, then
** rollback whatever the results of that command were */
xFunc = sqlite3BtreeRollback;
}
}
}else{
xFunc = sqlite3BtreeRollback;