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

Handle errors in saving cursor positions during a rollback by aborting all active statements. (CVS 3027)

Browse Source 
FossilOrigin-Name: 5df9f022bfb22976f22b996bda169635354b825c
This commit is contained in:
danielk1977
2006-01-24 16:37:57 +00:00
parent 2b8c13e7a7
commit 8d34dfd656
7 changed files with 111 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/btree.c
View File

@@ -9,7 +9,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
** $Id: btree.c,v 1.310 2006/01/24 14:21:24 danielk1977 Exp $
** $Id: btree.c,v 1.311 2006/01/24 16:37:58 danielk1977 Exp $
**
** This file implements a external (disk-based) database using BTrees.
** For a detailed discussion of BTrees, refer to
@@ -1693,9 +1693,6 @@ int sqlite3BtreeClose(Btree *p){
ThreadData *pTsd;
#endif
/* Drop any table-locks */
unlockAllTables(p);
/* Close all cursors opened via this handle. */
pCur = pBt->pCursor;
while( pCur ){
@@ -1706,7 +1703,10 @@ int sqlite3BtreeClose(Btree *p){
}
}
/* Rollback any active transaction and free the handle structure */
/* Rollback any active transaction and free the handle structure.
** The call to sqlite3BtreeRollback() drops any table-locks held by
** this handle.
*/
sqlite3BtreeRollback(p);
sqliteFree(p);
@@ -2538,21 +2538,40 @@ void sqlite3BtreeCursorList(Btree *p){
** are no active cursors, it also releases the read lock.
*/
int sqlite3BtreeRollback(Btree *p){
int rc = SQLITE_OK;
int rc;
BtShared *pBt = p->pBt;
MemPage *pPage1;
rc = saveAllCursors(pBt, 0, 0);
#ifndef SQLITE_OMIT_SHARED_CACHE
if( rc!=SQLITE_OK ){
return rc;
/* This is a horrible situation. An IO or malloc() error occured whilst
** trying to save cursor positions. If this is an automatic rollback (as
** the result of a constraint, malloc() failure or IO error) then
** the cache may be internally inconsistent (not contain valid trees) so
** we cannot simply return the error to the caller. Instead, abort
** all queries that may be using any of the cursors that failed to save.
*/
while( pBt->pCursor ){
sqlite3 *db = pBt->pCursor->pBtree->pSqlite;
if( db ){
sqlite3AbortOtherActiveVdbes(db, 0);
}
}
}
#endif
btreeIntegrity(p);
unlockAllTables(p);
if( p->inTrans==TRANS_WRITE ){
assert( TRANS_WRITE==pBt->inTransaction );
int rc2;
assert( TRANS_WRITE==pBt->inTransaction );
rc2 = sqlite3pager_rollback(pBt->pPager);
if( rc2!=SQLITE_OK ){
rc = rc2;
}
rc = sqlite3pager_rollback(pBt->pPager);
/* The rollback may have destroyed the pPage1->aData value. So
** call getPage() on page 1 again to make sure pPage1->aData is
** set correctly. */