database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

In btree.c, omit calls to setChildPtrmaps() if SQLITE_OMIT_AUTOVACUUM is defined. Ticket #3439. (CVS 5871)

Browse Source 
FossilOrigin-Name: e0f07323e878c44ad2ccc38628c74c27f79e35ef
This commit is contained in:
shane
2008-11-10 17:14:58 +00:00
parent 7ba429a61c
commit 831c329542
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Fixed\stypos;\sConsistent\suse\sof\sMac\sOS\sX\sname;\s(CVS\s5870) C In\sbtree.c,\somit\scalls\sto\ssetChildPtrmaps()\sif\sSQLITE_OMIT_AUTOVACUUM\sis\sdefined.\sTicket\s#3439.\s(CVS\s5871)
D 2008-11-10T17:08:49 D 2008-11-10T17:14:58
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in 48172b58e444a9725ec482e0c022a564749acab4 F Makefile.in 48172b58e444a9725ec482e0c022a564749acab4
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -99,7 +99,7 @@ F src/attach.c 208881c87160d9e2c73a46cf86116c5a6d66f9d7
F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627 F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
F src/bitvec.c bb0b12b258496ad1903732db55219dc46571fe09 F src/bitvec.c bb0b12b258496ad1903732db55219dc46571fe09
F src/btmutex.c 3a90096c3080b9057dc570b8e16e46511e1c788a F src/btmutex.c 3a90096c3080b9057dc570b8e16e46511e1c788a
F src/btree.c 4320c62609de61a64231e8dcfe857966120844cc F src/btree.c e0ceb752348ab564434552f52e6c771294a5608c
F src/btree.h 179c3ea813780df78a289a8f5130db18e6d4616e F src/btree.h 179c3ea813780df78a289a8f5130db18e6d4616e
F src/btreeInt.h e38e9b2b285f40f5bc0a6664f630d4a141622f16 F src/btreeInt.h e38e9b2b285f40f5bc0a6664f630d4a141622f16
F src/build.c 41464eb891eb3672b30a5188a352187cba038af9 F src/build.c 41464eb891eb3672b30a5188a352187cba038af9
@@ -654,7 +654,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
P 3f657e88767f60d305dd6151e7aa54363341d052 P dfc94743378e576ecc5c567ae4020bf9594a3fb9
R bf365330fc5e332148151c6b5e77140a R ab50adb2868cd6b34252f3f59477e787
U shane U shane
Z b9b4cb42d1c0d5e13f65a9208e9214a2 Z f5661d40fe2eef239e43f4c5401e5473

2
manifest.uuid
View File

@@ -1 +1 @@
dfc94743378e576ecc5c567ae4020bf9594a3fb9 e0f07323e878c44ad2ccc38628c74c27f79e35ef

9
src/btree.c
View File

@@ -9,7 +9,7 @@
** May you share freely, never taking more than you give. ** May you share freely, never taking more than you give.
** **
************************************************************************* *************************************************************************
** $Id: btree.c,v 1.527 2008/11/03 20:55:07 drh Exp $ ** $Id: btree.c,v 1.528 2008/11/10 17:14:58 shane Exp $
** **
** This file implements a external (disk-based) database using BTrees. ** This file implements a external (disk-based) database using BTrees.
** See the header comment on "btreeInt.h" for additional information. ** See the header comment on "btreeInt.h" for additional information.
@@ -2037,7 +2037,6 @@ trans_begun:
return rc; return rc;
} }
#ifndef SQLITE_OMIT_AUTOVACUUM #ifndef SQLITE_OMIT_AUTOVACUUM
/* /*
@@ -2427,7 +2426,7 @@ static int autoVacuumCommit(BtShared *pBt, Pgno *pnTrunc){
return rc; return rc;
} }
#endif #endif /* ifndef SQLITE_OMIT_AUTOVACUUM */
/* /*
** This routine does the first phase of a two-phase commit. This routine ** This routine does the first phase of a two-phase commit. This routine
@@ -5545,9 +5544,11 @@ static int balance_shallower(BtCursor *pCur){
pChild->pgno, pPage->pgno)); pChild->pgno, pPage->pgno));
} }
assert( pPage->nOverflow==0 ); assert( pPage->nOverflow==0 );
#ifndef SQLITE_OMIT_AUTOVACUUM
if( ISAUTOVACUUM ){ if( ISAUTOVACUUM ){
rc = setChildPtrmaps(pPage); rc = setChildPtrmaps(pPage);
} }
#endif
releasePage(pChild); releasePage(pChild);
} }
end_shallow_balance: end_shallow_balance:
@@ -5609,9 +5610,11 @@ static int balance_deeper(BtCursor *pCur){
TRACE(("BALANCE: copy root %d into %d\n", pPage->pgno, pChild->pgno)); TRACE(("BALANCE: copy root %d into %d\n", pPage->pgno, pChild->pgno));
if( ISAUTOVACUUM ){ if( ISAUTOVACUUM ){
rc = ptrmapPut(pBt, pChild->pgno, PTRMAP_BTREE, pPage->pgno); rc = ptrmapPut(pBt, pChild->pgno, PTRMAP_BTREE, pPage->pgno);
#ifndef SQLITE_OMIT_AUTOVACUUM
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK ){
rc = setChildPtrmaps(pChild); rc = setChildPtrmaps(pChild);
} }
#endif
} }
} }