-C Remove\sthe\sMemPage.idxShift\svariable.\sIt\sis\sno\slonger\srequired.\s(CVS\s5750)
-D 2008-09-29T15:53:26
+C Remove\sthe\sreparentPage()\sand\sreparentChildPages()\sfunctions\sfrom\sbtree.c.\sAll\scalls\sto\sthese\sfunctions\scan\snow\sbe\sreplaced\sby\sa\scall\sto\ssetChildPtrmaps().\s(CVS\s5751)
+D 2008-09-29T16:41:32
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in e4ab842f9a64ef61d57093539a8aab76b12810db
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
F src/bitvec.c 95c86bd18d8fedf0533f5af196192546e10a7e7d
F src/btmutex.c 709cad2cdca0afd013f0f612363810e53f59ec53
-F src/btree.c 002084e207070d17e29863a7453409fd8717dd73
+F src/btree.c df02edb06f8fcb53d607a338d77434c4a3bffe7a
F src/btree.h 6371c5e599fab391a150c96afbc10062b276d107
F src/btreeInt.h 3e93c0a6f363bbf68fdd975620f4d3671b6cf7bc
F src/build.c 160c71acca8f643f436ed6c1ee2f684c88df4dfe
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 2fb15ae9e9af716a5684a21826814bc4c332a596
-R 45649b03c1be1592a9f04aa95ab9d358
+P 7354abd03be756b1d7d0a3d5b8958f5c0c985ff5
+R 0f06dc556542affcd1339888998b5de0
U danielk1977
-Z 44ecc5d9fa4059a6de64d456c7327e83
+Z 09ed030904a23d22068a2c20cf1cad6c
** May you share freely, never taking more than you give.
**
*************************************************************************
-** $Id: btree.c,v 1.519 2008/09/29 15:53:26 danielk1977 Exp $
+** $Id: btree.c,v 1.520 2008/09/29 16:41:32 danielk1977 Exp $
**
** This file implements a external (disk-based) database using BTrees.
** See the header comment on "btreeInt.h" for additional information.
if( !pPage->leaf ){
Pgno childPgno = get4byte(pCell);
rc = ptrmapPut(pBt, childPgno, PTRMAP_BTREE, pgno);
- if( rc!=SQLITE_OK ) goto set_child_ptrmaps_out;
+ if( rc!=SQLITE_OK ) goto set_child_ptrmaps_out;
}
}
return SQLITE_OK;
}
-
-/*
-** Change the MemPage.pParent pointer on the page whose number is
-** given in the second argument so that MemPage.pParent holds the
-** pointer in the third argument.
-**
-** If the final argument, updatePtrmap, is non-zero and the database
-** is an auto-vacuum database, then the pointer-map entry for pgno
-** is updated.
-*/
-static int reparentPage(
- BtShared *pBt, /* B-Tree structure */
- Pgno pgno, /* Page number of child being adopted */
- MemPage *pNewParent, /* New parent of pgno */
- int idx, /* Index of child page pgno in pNewParent */
- int updatePtrmap /* If true, update pointer-map for pgno */
-){
- DbPage *pDbPage;
- if( ISAUTOVACUUM && updatePtrmap ){
- return ptrmapPut(pBt, pgno, PTRMAP_BTREE, pNewParent->pgno);
- }
-
-#ifndef NDEBUG
- /* If the updatePtrmap flag was clear, assert that the entry in the
- ** pointer-map is already correct.
- */
- if( ISAUTOVACUUM ){
- pDbPage = sqlite3PagerLookup(pBt->pPager,PTRMAP_PAGENO(pBt,pgno));
- if( pDbPage ){
- u8 eType;
- Pgno ii;
- int rc = ptrmapGet(pBt, pgno, &eType, &ii);
- assert( rc==SQLITE_OK && ii==pNewParent->pgno && eType==PTRMAP_BTREE );
- sqlite3PagerUnref(pDbPage);
- }
- }
-#endif
-
- return SQLITE_OK;
-}
-
-
-
-/*
-** Change the pParent pointer of all children of pPage to point back
-** to pPage.
-**
-** In other words, for every child of pPage, invoke reparentPage()
-** to make sure that each child knows that pPage is its parent.
-**
-** This routine gets called after you memcpy() one page into
-** another.
-**
-** If updatePtrmap is true, then the pointer-map entries for all child
-** pages of pPage are updated.
-*/
-static int reparentChildPages(MemPage *pPage, int updatePtrmap){
- int rc = SQLITE_OK;
- assert( sqlite3_mutex_held(pPage->pBt->mutex) );
- if( !pPage->leaf ){
- int i;
- BtShared *pBt = pPage->pBt;
- Pgno iRight = get4byte(&pPage->aData[pPage->hdrOffset+8]);
-
- for(i=0; i<pPage->nCell; i++){
- u8 *pCell = findCell(pPage, i);
- rc = reparentPage(pBt, get4byte(pCell), pPage, i, updatePtrmap);
- if( rc!=SQLITE_OK ) return rc;
- }
- rc = reparentPage(pBt, iRight, pPage, i, updatePtrmap);
- }
- return rc;
-}
-
/*
** Remove the i-th cell from pPage. This routine effects pPage only.
** The cell content is not freed or deallocated. It is assumed that
put4byte(findOverflowCell(pParent, nxDiv), pgnoNew[nNew-1]);
}
- /*
- ** At this point we used to call reparentChildPages() to make sure that
- ** the MemPage.pParent and MemPage.idxParent variables are correct for
- ** all children of the pages modified by this balance operation. Even
- ** if this is an auto-vacuum database there is no need to update the
- ** pointer-map entries for child pages - that has already been done
- ** by the block above.
- **
- ** However, this is no longer necessary because the MemPage.pParent and
- ** MemPage.idxParent variables are only assumed to be valid when there
- ** are one or more references to the page (when isInit==PAGE_ISINIT_FULL).
- ** At this point we can account for all references to the pages
- ** manipulated by this function and deduce that it is not necessary to
- ** update these two variables because:
- **
- ** a) it must have been called, directly or indirectly, from BtreeInsert()
- ** or BtreeDelete(). Both these functions call saveAllCursors(), so
- ** we can be sure that there exactly one write-cursor (and no
- ** read-cursors) open on the b-tree being manipulated. No other
- ** cursor may be holding references to any pages in the b-tree.
- **
- ** b) After this function returns, the one open write-cursor will be
- ** moved to point at the root of the table using moveToRoot(). The
- ** code that does this (see BtreeInsert() and BtreeDelete()) ensures
- ** that the MemPage.pParent variables are not used to find the root
- ** page of the b-tree, it is located using BtCursor.pgnoRoot.
- **
- ** c) the other page references are those held by this function, on
- ** the pages in apNew[] and apOld[]. They are about to be released.
- **
- ** Therefore, no need to call reparentChildPages(). This can be a
- ** significant performance boost.
- */
-#if 0
- for(i=0; i<nNew; i++){
- rc = reparentChildPages(apNew[i], 0);
- if( rc!=SQLITE_OK ) goto balance_cleanup;
- }
- rc = reparentChildPages(pParent, 0);
- if( rc!=SQLITE_OK ) goto balance_cleanup;
-#endif
-
/*
** Balance the parent page. Note that the current page (pPage) might
** have been added to the freelist so it might no longer be initialized.
TRACE(("BALANCE: transfer child %d into root %d\n",
pChild->pgno, pPage->pgno));
}
- rc = reparentChildPages(pPage, 1);
assert( pPage->nOverflow==0 );
if( ISAUTOVACUUM ){
- int i;
- for(i=0; i<pPage->nCell; i++){
- rc = ptrmapPutOvfl(pPage, i);
- if( rc!=SQLITE_OK ){
- goto end_shallow_balance;
- }
- }
+ rc = setChildPtrmaps(pPage);
}
releasePage(pChild);
}
put4byte(&pPage->aData[pPage->hdrOffset+8], pgnoChild);
TRACE(("BALANCE: copy root %d into %d\n", pPage->pgno, pChild->pgno));
if( ISAUTOVACUUM ){
- int i;
rc = ptrmapPut(pBt, pChild->pgno, PTRMAP_BTREE, pPage->pgno);
- for(i=0; rc==SQLITE_OK && i<pChild->nCell; i++){
- rc = ptrmapPutOvfl(pChild, i);
- }
if( rc==SQLITE_OK ){
- rc = reparentChildPages(pChild, 1);
+ rc = setChildPtrmaps(pChild);
}
}
}
projects / thirdparty / sqlite.git / commitdiff
