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

Formatting changes in btree.c. (CVS 2865)

Browse Source 
FossilOrigin-Name: f1922da2d20c5091678e47cc4f43a2a9d141a3b1
This commit is contained in:
drh
2006-01-06 01:42:58 +00:00
parent 3fbb0b1a3b
commit 47ded16fdc
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Windows\simplementation\sof\sthe\sthread-specific\sdata\sinterface.\s(CVS\s2864) C Formatting\schanges\sin\sbtree.c.\s(CVS\s2865)
D 2006-01-06T00:36:01 D 2006-01-06T01:42:58
F Makefile.in e3c6b3a38d734d41574c04f2fc90d18de2b87102 F Makefile.in e3c6b3a38d734d41574c04f2fc90d18de2b87102
F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -34,7 +34,7 @@ F src/alter.c e9deb3f4fd7c663a0d1f235d541bc5ea1f2cfa8b
F src/analyze.c d821684cdb4d0403e327e4a3440a832e9e54fa3a F src/analyze.c d821684cdb4d0403e327e4a3440a832e9e54fa3a
F src/attach.c 999104c56a60b88eab11ef9c8f40dedf1650b287 F src/attach.c 999104c56a60b88eab11ef9c8f40dedf1650b287
F src/auth.c cdec356a5cd8b217c346f816c5912221537fe87f F src/auth.c cdec356a5cd8b217c346f816c5912221537fe87f
F src/btree.c f848dd6e590f6bb93e2f229d87080c900d49bd4c F src/btree.c 88a60d2af49daed01316cafbe93777d4d9ba2800
F src/btree.h 96b8c00c6e11ff92f8d3d6a7a0ff358bd10d8f19 F src/btree.h 96b8c00c6e11ff92f8d3d6a7a0ff358bd10d8f19
F src/build.c 6b14101f1ed5328c815e12baec11dcec97eed096 F src/build.c 6b14101f1ed5328c815e12baec11dcec97eed096
F src/callback.c 62066afd516f220575e81b1a1239ab92a2eae252 F src/callback.c 62066afd516f220575e81b1a1239ab92a2eae252
@@ -336,7 +336,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
P 448b3b9dede724749df0004ca39c649951f1f2ca P 3aa8befedf4534cd100a7309997a4ad2ba08af20
R dcf7542b8c94e9c5f5cab045190921be R 9cd535a89cd298ffd8e9b65d3f2c3f9a
U drh U drh
Z 83024d815993803987e6aa0634273fc2 Z a5a9ef920432f3770a07cda8da51fc95

2
manifest.uuid
View File

@@ -1 +1 @@
3aa8befedf4534cd100a7309997a4ad2ba08af20 f1922da2d20c5091678e47cc4f43a2a9d141a3b1

17
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.279 2006/01/05 11:34:34 danielk1977 Exp $ ** $Id: btree.c,v 1.280 2006/01/06 01:42:58 drh Exp $
** **
** This file implements a external (disk-based) database using BTrees. ** This file implements a external (disk-based) database using BTrees.
** For a detailed discussion of BTrees, refer to ** For a detailed discussion of BTrees, refer to
@@ -289,10 +289,10 @@ struct MemPage {
u8 *pCell; /* Pointers to the body of the overflow cell */ u8 *pCell; /* Pointers to the body of the overflow cell */
u16 idx; /* Insert this cell before idx-th non-overflow cell */ u16 idx; /* Insert this cell before idx-th non-overflow cell */
} aOvfl[5]; } aOvfl[5];
BtShared *pBt; /* Pointer back to BTree structure */ BtShared *pBt; /* Pointer back to BTree structure */
u8 *aData; /* Pointer back to the start of the page */ u8 *aData; /* Pointer back to the start of the page */
Pgno pgno; /* Page number for this page */ Pgno pgno; /* Page number for this page */
MemPage *pParent; /* The parent of this page. NULL for root */ MemPage *pParent; /* The parent of this page. NULL for root */
}; };
/* /*
@@ -527,7 +527,7 @@ static int saveCursorPosition(BtCursor *pCur){
void *pKey = sqliteMalloc(pCur->nKey); void *pKey = sqliteMalloc(pCur->nKey);
if( pKey ){ if( pKey ){
rc = sqlite3BtreeKey(pCur, 0, pCur->nKey, pKey); rc = sqlite3BtreeKey(pCur, 0, pCur->nKey, pKey);
if( pKey ){ if( rc==SQLITE_OK ){
pCur->pKey = pKey; pCur->pKey = pKey;
}else{ }else{
sqliteFree(pKey); sqliteFree(pKey);
@@ -630,7 +630,7 @@ static int queryTableLock(Btree *p, Pgno iTab, u8 eLock){
!p->pSqlite || !p->pSqlite ||
0==(p->pSqlite->flags&SQLITE_ReadUncommitted) || 0==(p->pSqlite->flags&SQLITE_ReadUncommitted) ||
eLock==WRITE_LOCK || eLock==WRITE_LOCK ||
iTab==1 iTab==MASTER_ROOT
){ ){
for(pIter=pBt->pLock; pIter; pIter=pIter->pNext){ for(pIter=pBt->pLock; pIter; pIter=pIter->pNext){
if( pIter->pBtree!=p && pIter->iTable==iTab && if( pIter->pBtree!=p && pIter->iTable==iTab &&
@@ -671,7 +671,7 @@ static int lockTable(Btree *p, Pgno iTable, u8 eLock){
(p->pSqlite) && (p->pSqlite) &&
(p->pSqlite->flags&SQLITE_ReadUncommitted) && (p->pSqlite->flags&SQLITE_ReadUncommitted) &&
(eLock==READ_LOCK) && (eLock==READ_LOCK) &&
iTable!=1 iTable!=MASTER_ROOT
){ ){
return SQLITE_OK; return SQLITE_OK;
} }
@@ -6496,4 +6496,3 @@ int sqlite3_enable_shared_cache(int enable){
return SQLITE_OK; return SQLITE_OK;
} }
#endif #endif