SQLite4
Check-in [4a2be461c1]
Check-in [4a2be461c1]
Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
| Comment: | When loading free-list elements from the lsm, merge them into the existing free-list so that free blocks are always sorted from least to most recently used. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | multi-process |
| Files: | files | file ages | folders |
| SHA1: |
4a2be461c13a2e326c70c4c038bc7464 |
| User & Date: | dan 2012-09-01 11:09:33 |
|
2012-09-01
| ||
| 12:04 | Do not open the log file until it is first written or read. This ensures that it is not opened before locks that prevent other processes from unlinking it have been obtained. check-in: 0f28f8317b user: dan tags: multi-process | |
| 11:09 | When loading free-list elements from the lsm, merge them into the existing free-list so that free blocks are always sorted from least to most recently used. check-in: 4a2be461c1 user: dan tags: multi-process | |
| 09:11 | Fix a bug in the test used to determine if a free block is ready for reuse. check-in: 3423d37092 user: dan tags: multi-process | |
Changes to src/lsm_ckpt.c.
728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 |
Freelist *pFreelist
){
int rc;
int nVal = 0;
void *pVal = 0;
assert( lsmShmAssertWorker(pDb) );
rc = lsmSortedLoadFreelist(pDb, &pVal, &nVal);
if( pVal ){
u32 *aFree = (u32 *)pVal;
int nFree = nVal / sizeof(int);
ckptChangeEndianness(aFree, nFree);
if( (nFree % 3) ){
rc = LSM_CORRUPT_BKPT;
}else{
int i;
for(i=0; rc==LSM_OK && i<nFree; i+=3){
int iBlk = aFree[i];
i64 iId = ((i64)(aFree[i+1])<<32) + (i64)aFree[i+2];
rc = lsmFreelistAppend(pDb->pEnv, pFreelist, iBlk, iId);
}
}
lsmFree(pDb->pEnv, pVal);
}
return rc;
}
|
> > > < > > > > > > | < > > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 |
Freelist *pFreelist
){
int rc;
int nVal = 0;
void *pVal = 0;
assert( lsmShmAssertWorker(pDb) );
/* Load the blob of data from the LSM. If that is successful (and the
** blob is greater than zero bytes in size), decode the contents and
** merge them into the current contents of *pFreelist. */
rc = lsmSortedLoadFreelist(pDb, &pVal, &nVal);
if( pVal ){
u32 *aFree = (u32 *)pVal;
int nFree = nVal / sizeof(int);
ckptChangeEndianness(aFree, nFree);
if( (nFree % 3) ){
rc = LSM_CORRUPT_BKPT;
}else{
int iNew = 0; /* Offset of next element in aFree[] */
int iOld = 0; /* Next element in freelist fl */
Freelist fl = *pFreelist; /* Original contents of *pFreelist */
memset(pFreelist, 0, sizeof(Freelist));
while( rc==LSM_OK && (iNew<nFree || iOld<fl.nEntry) ){
int iBlk;
i64 iId;
if( iOld>=fl.nEntry ){
iBlk = aFree[iNew];
iId = ((i64)(aFree[iNew+1])<<32) + (i64)aFree[iNew+2];
iNew += 3;
}else if( iNew>=nFree ){
iBlk = fl.aEntry[iOld].iBlk;
iId = fl.aEntry[iOld].iId;
iOld += 1;
}else{
iId = ((i64)(aFree[iNew+1])<<32) + (i64)aFree[iNew+2];
if( iId<fl.aEntry[iOld].iId ){
iBlk = aFree[iNew];
iNew += 3;
}else{
iBlk = fl.aEntry[iOld].iBlk;
iId = fl.aEntry[iOld].iId;
iOld += 1;
}
}
rc = lsmFreelistAppend(pDb->pEnv, pFreelist, iBlk, iId);
}
lsmFree(pDb->pEnv, fl.aEntry);
#ifdef LSM_DEBUG
if( rc==LSM_OK ){
int i;
for(i=1; rc==LSM_OK && i<pFreelist->nEntry; i++){
assert( pFreelist->aEntry[i].iId >= pFreelist->aEntry[i-1].iId );
}
assert( pFreelist->nEntry==(fl.nEntry + nFree/3) );
}
#endif
}
lsmFree(pDb->pEnv, pVal);
}
return rc;
}
|